Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

Olm
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

b1130fb7

Unverified Commit b1130fb7 authored 6 years ago by David Baker Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #61 from matrix-org/dbkr/pk_private_export_import

Work with PkDecryption keys by their private keys

parents b2d91f55 50ed20f6

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 4 additions, 0 deletions

CHANGELOG.rst
include/olm/error.h 7 additions, 0 deletions

include/olm/error.h
include/olm/pk.h 39 additions, 9 deletions

include/olm/pk.h
javascript/olm_pk.js 30 additions, 2 deletions

javascript/olm_pk.js
javascript/olm_pre.js 1 addition, 0 deletions

javascript/olm_pre.js
javascript/test/pk.spec.js 14 additions, 0 deletions

javascript/test/pk.spec.js
src/error.c 1 addition, 0 deletions

src/error.c
src/pk.cpp 35 additions, 6 deletions

src/pk.cpp
tests/test_pk.cpp 7 additions, 2 deletions

tests/test_pk.cpp

with 138 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment