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

Add unit tests for static key derivation.

Browse Source
This commit is contained in:
akwizgran
2019-04-10 15:18:26 +01:00
parent d5ac2c9ead
commit fccf735a89
6 changed files with 389 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bramble-core/src/main/java/org/briarproject/bramble/crypto/TransportCryptoImpl.java
View File

@@ -116,7 +116,7 @@ class TransportCryptoImpl implements TransportCrypto {
@Override
public StaticTransportKeys deriveStaticTransportKeys(TransportId t,
SecretKey rootKey, boolean alice, long timePeriod) {
SecretKey rootKey, long timePeriod, boolean alice) {
if (timePeriod < 1) throw new IllegalArgumentException();
IncomingKeys inPrev = deriveStaticIncomingKeys(t, rootKey, alice,
timePeriod - 1);
@@ -165,7 +165,7 @@ class TransportCryptoImpl implements TransportCrypto {
}
@Override
public StaticTransportKeys updateTransportKeys(StaticTransportKeys k,
public StaticTransportKeys updateStaticTransportKeys(StaticTransportKeys k,
long timePeriod) {
long elapsed = timePeriod - k.getTimePeriod();
TransportId t = k.getTransportId();
@@ -197,7 +197,7 @@ class TransportCryptoImpl implements TransportCrypto {
rootKey, alice);
} else {
// The keys are more than two periods old - derive fresh keys
return deriveStaticTransportKeys(t, rootKey, alice, timePeriod);
return deriveStaticTransportKeys(t, rootKey, timePeriod, alice);
}
}