Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

933eee18

Commit 933eee18 authored 9 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '117-bqp-crypto' into 'master'

BQP crypto

This implements the `CryptoComponent` methods necessary for BQP.

Part of #117.

See merge request !88

parents 86a81478 c8226236

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/org/briarproject/android/invitation/AddContactActivity.java 1 addition, 1 deletion

...g/briarproject/android/invitation/AddContactActivity.java
briar-api/src/org/briarproject/api/crypto/CryptoComponent.java 74 additions, 12 deletions

...-api/src/org/briarproject/api/crypto/CryptoComponent.java
briar-api/src/org/briarproject/api/keyagreement/KeyAgreementConstants.java 8 additions, 0 deletions

.../briarproject/api/keyagreement/KeyAgreementConstants.java
briar-core/src/org/briarproject/crypto/CryptoComponentImpl.java 97 additions, 54 deletions

...core/src/org/briarproject/crypto/CryptoComponentImpl.java
briar-core/src/org/briarproject/invitation/AliceConnector.java 6 additions, 6 deletions

...-core/src/org/briarproject/invitation/AliceConnector.java
briar-core/src/org/briarproject/invitation/BobConnector.java 6 additions, 6 deletions

briar-core/src/org/briarproject/invitation/BobConnector.java
briar-tests/src/org/briarproject/crypto/KeyAgreementTest.java 14 additions, 1 deletion

...r-tests/src/org/briarproject/crypto/KeyAgreementTest.java
briar-tests/src/org/briarproject/crypto/KeyEncodingAndParsingTest.java 8 additions, 8 deletions

...rc/org/briarproject/crypto/KeyEncodingAndParsingTest.java

with 214 additions and 88 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