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

Merge branch '1570-derive-handshake-root-key' into 'master'

Browse Source 
Add contact manager and key manager methods for converting a pending contact

Closes #1570

See merge request briar/briar!1114
This commit is contained in:
Torsten Grote
2019-06-03 14:33:21 +00:00
parent d3c7c54797 fe83a59d2a
commit 8fc5c21354
23 changed files with 369 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,7 +444,7 @@ class IntroduceeProtocolEngine
// add the keys to the new contact
//noinspection ConstantConditions
keys = keyManager.addContactWithRotationKeys(txn, c.getId(),
keys = keyManager.addRotationKeys(txn, c.getId(),
new SecretKey(s.getMasterKey()), timestamp,
s.getLocal().alice, false);