Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'remove-unbound-transport-keys' into 'master'

Browse Source 
Remove support for unbound transport keys

See merge request akwizgran/briar!791
This commit is contained in:
Torsten Grote
2018-05-15 14:18:58 +00:00
parent 6ed16802ce fec384c200
commit 5c068ed07b
19 changed files with 179 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java
View File

@@ -453,12 +453,11 @@ class IntroduceeProtocolEngine
.getContact(txn, s.getRemote().author.getId(),
localAuthor.getId());
// bind the keys to the new contact
// add the keys to the new contact
//noinspection ConstantConditions
keys = keyManager
.addUnboundKeys(txn, new SecretKey(s.getMasterKey()),
timestamp, s.getLocal().alice);
keyManager.bindKeys(txn, c.getId(), keys);
.addContact(txn, c.getId(), new SecretKey(s.getMasterKey()),
timestamp, s.getLocal().alice, false);
// add signed transport properties for the contact
//noinspection ConstantConditions