From 6d6e47409f94ea4e28f6dec9349bb088b2be56d4 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 28 Nov 2017 11:49:28 +0000
Subject: [PATCH] Include protocol version in group ID derivation.
---
.../java/org/briarproject/bramble/sync/GroupFactoryImpl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/GroupFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/GroupFactoryImpl.java
index 18065fc104..86ac6cda67 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/sync/GroupFactoryImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/GroupFactoryImpl.java
@@ -11,6 +11,9 @@ import org.briarproject.bramble.util.StringUtils;
import javax.annotation.concurrent.Immutable;
import javax.inject.Inject;
+import static org.briarproject.bramble.api.sync.GroupId.LABEL;
+import static org.briarproject.bramble.api.sync.SyncConstants.PROTOCOL_VERSION;
+
@Immutable
@NotNullByDefault
class GroupFactoryImpl implements GroupFactory {
@@ -24,7 +27,7 @@ class GroupFactoryImpl implements GroupFactory {
@Override
public Group createGroup(ClientId c, byte[] descriptor) {
- byte[] hash = crypto.hash(GroupId.LABEL,
+ byte[] hash = crypto.hash(LABEL, new byte[] {PROTOCOL_VERSION},
StringUtils.toUtf8(c.getString()), descriptor);
return new Group(new GroupId(hash), c, descriptor);
}
--
GitLab