Merge branch 'multiple-transport-keys' into 'master' (95b9b3a3) · Commits · Julian Dehm / briar

Commit 95b9b3a3 authored 6 years ago by akwizgran

Merge branch 'multiple-transport-keys' into 'master'

Support multiple sets of transport keys per contact

See merge request akwizgran/briar!745

parents ede390b8 b81058d6

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java 1 addition, 1 deletion

.../java/org/briarproject/bramble/api/contact/ContactId.java
bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java 10 additions, 2 deletions

.../org/briarproject/bramble/api/contact/ContactManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/crypto/TransportCrypto.java 2 additions, 1 deletion

.../org/briarproject/bramble/api/crypto/TransportCrypto.java
bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java 33 additions, 13 deletions

...va/org/briarproject/bramble/api/db/DatabaseComponent.java
bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeyManager.java 41 additions, 1 deletion

...va/org/briarproject/bramble/api/transport/KeyManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySet.java 51 additions, 0 deletions

...n/java/org/briarproject/bramble/api/transport/KeySet.java
bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySetId.java 36 additions, 0 deletions

...java/org/briarproject/bramble/api/transport/KeySetId.java
bramble-api/src/main/java/org/briarproject/bramble/api/transport/OutgoingKeys.java 9 additions, 3 deletions

.../org/briarproject/bramble/api/transport/OutgoingKeys.java
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java 11 additions, 1 deletion

.../org/briarproject/bramble/contact/ContactManagerImpl.java
bramble-core/src/main/java/org/briarproject/bramble/crypto/TransportCryptoImpl.java 5 additions, 3 deletions

.../org/briarproject/bramble/crypto/TransportCryptoImpl.java
bramble-core/src/main/java/org/briarproject/bramble/db/Database.java 30 additions, 11 deletions

...e/src/main/java/org/briarproject/bramble/db/Database.java
bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java 50 additions, 26 deletions

...va/org/briarproject/bramble/db/DatabaseComponentImpl.java
bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java 177 additions, 116 deletions

...c/main/java/org/briarproject/bramble/db/JdbcDatabase.java
bramble-core/src/main/java/org/briarproject/bramble/transport/KeyManagerImpl.java 64 additions, 2 deletions

...va/org/briarproject/bramble/transport/KeyManagerImpl.java
bramble-core/src/main/java/org/briarproject/bramble/transport/MutableKeySet.java 34 additions, 0 deletions

...ava/org/briarproject/bramble/transport/MutableKeySet.java
bramble-core/src/main/java/org/briarproject/bramble/transport/MutableOutgoingKeys.java 11 additions, 1 deletion

...g/briarproject/bramble/transport/MutableOutgoingKeys.java
bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManager.java 12 additions, 0 deletions

...g/briarproject/bramble/transport/TransportKeyManager.java
bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java 168 additions, 56 deletions

...iarproject/bramble/transport/TransportKeyManagerImpl.java
bramble-core/src/test/java/org/briarproject/bramble/crypto/KeyDerivationTest.java 11 additions, 11 deletions

...va/org/briarproject/bramble/crypto/KeyDerivationTest.java
bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java 53 additions, 43 deletions

...rg/briarproject/bramble/db/DatabaseComponentImplTest.java

with 809 additions and 291 deletions

Please register or to comment