Merge branch '617-crypto-labels' into 'master' (c777a57a) · Commits · Julian Dehm / briar

Commit c777a57a authored 7 years ago by akwizgran

Merge branch '617-crypto-labels' into 'master'

Use namespaced labels for all crypto operations

See merge request !632

parents 14b18e9d 4397a455

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java 21 additions, 0 deletions

...briarproject/bramble/api/contact/ContactExchangeTask.java
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java 27 additions, 110 deletions

.../org/briarproject/bramble/api/crypto/CryptoComponent.java
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyAgreementCrypto.java 50 additions, 0 deletions

...g/briarproject/bramble/api/crypto/KeyAgreementCrypto.java
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/TransportCrypto.java 32 additions, 0 deletions

.../org/briarproject/bramble/api/crypto/TransportCrypto.java
bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorId.java 1 addition, 1 deletion

.../java/org/briarproject/bramble/api/identity/AuthorId.java
bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java 17 additions, 2 deletions

...oject/bramble/api/keyagreement/KeyAgreementConstants.java
bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTaskFactory.java 0 additions, 15 deletions

...ect/bramble/api/keyagreement/KeyAgreementTaskFactory.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupId.java 1 addition, 1 deletion

.../main/java/org/briarproject/bramble/api/sync/GroupId.java
bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageId.java 1 addition, 1 deletion

...ain/java/org/briarproject/bramble/api/sync/MessageId.java
bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportConstants.java 29 additions, 1 deletion

...riarproject/bramble/api/transport/TransportConstants.java
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java 6 additions, 6 deletions

...briarproject/bramble/contact/ContactExchangeTaskImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java 14 additions, 236 deletions

.../org/briarproject/bramble/crypto/CryptoComponentImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoModule.java 18 additions, 2 deletions

...in/java/org/briarproject/bramble/crypto/CryptoModule.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/KeyAgreementCryptoImpl.java 56 additions, 0 deletions

...g/briarproject/bramble/crypto/KeyAgreementCryptoImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterFactoryImpl.java 6 additions, 1 deletion

...iarproject/bramble/crypto/StreamEncrypterFactoryImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/TransportCryptoImpl.java 135 additions, 0 deletions

.../org/briarproject/bramble/crypto/TransportCryptoImpl.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementConnector.java 6 additions, 6 deletions

...arproject/bramble/keyagreement/KeyAgreementConnector.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementModule.java 4 additions, 17 deletions

...briarproject/bramble/keyagreement/KeyAgreementModule.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementProtocol.java 29 additions, 13 deletions

...iarproject/bramble/keyagreement/KeyAgreementProtocol.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskFactoryImpl.java 0 additions, 46 deletions

...ect/bramble/keyagreement/KeyAgreementTaskFactoryImpl.java

with 453 additions and 458 deletions

Please register or to comment