From 05791570107ceafeb3db434a6146e2c2aca6e456 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 5 Jun 2019 10:59:21 +0100 Subject: [PATCH] Include protocol version in rendezvous key derivation. --- .../briarproject/bramble/rendezvous/RendezvousCryptoImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java index 9d66fdbee..f2f0b2ca4 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java @@ -11,6 +11,7 @@ import javax.annotation.concurrent.Immutable; import javax.inject.Inject; import static org.briarproject.bramble.rendezvous.RendezvousConstants.KEY_MATERIAL_LABEL; +import static org.briarproject.bramble.rendezvous.RendezvousConstants.PROTOCOL_VERSION; import static org.briarproject.bramble.rendezvous.RendezvousConstants.RENDEZVOUS_KEY_LABEL; import static org.briarproject.bramble.util.StringUtils.toUtf8; @@ -27,7 +28,8 @@ class RendezvousCryptoImpl implements RendezvousCrypto { @Override public SecretKey deriveRendezvousKey(SecretKey staticMasterKey) { - return crypto.deriveKey(RENDEZVOUS_KEY_LABEL, staticMasterKey); + return crypto.deriveKey(RENDEZVOUS_KEY_LABEL, staticMasterKey, + new byte[] {PROTOCOL_VERSION}); } @Override -- 2.24.1