TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-10 19:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Derive GV2 master key and group id from GV1.

Browse Source
This commit is contained in:
Alan Evans 2020-10-13 10:15:37 -03:00 committed by Greyson Parrelli
parent 9effa47dd8
commit babe1833bb
2 changed files with 69 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/groups/GroupId.java
View File

@ -3,11 +3,13 @@ package org.thoughtcrime.securesms.groups;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.zkgroup.InvalidInputException;
import org.signal.zkgroup.groups.GroupIdentifier;
import org.signal.zkgroup.groups.GroupMasterKey;
import org.signal.zkgroup.groups.GroupSecretParams;
import org.thoughtcrime.securesms.util.Hex;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.kdf.HKDFv3;
import java.io.IOException;
import java.security.SecureRandom;
@ -258,13 +260,25 @@ public abstract class GroupId {
@Override
public boolean isV1() {
return true;
}
return true;
}
@Override
public boolean isV2() {
return false;
}
return false;
}
public GroupMasterKey deriveV2MigrationMasterKey() {
try {
return new GroupMasterKey(new HKDFv3().deriveSecrets(getDecodedId(), "GV2 Migration".getBytes(), GroupMasterKey.SIZE));
} catch (InvalidInputException e) {
throw new AssertionError(e);
}
}
public GroupId.V2 deriveV2MigrationGroupId() {
return v2(deriveV2MigrationMasterKey());
}
}
public static final class V2 extends GroupId.Push {

51
app/src/test/java/org/thoughtcrime/securesms/groups/GroupId_v1_v2_migration_derivation_Test.java Normal file
View File

@ -0,0 +1,51 @@
package org.thoughtcrime.securesms.groups;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.signal.zkgroup.groups.GroupMasterKey;
import org.thoughtcrime.securesms.util.Hex;
import java.util.Arrays;
import java.util.Collection;
import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class)
public final class GroupId_v1_v2_migration_derivation_Test {
@Parameterized.Parameter(0)
public String inputV1GroupId;
@Parameterized.Parameter(1)
public String expectedMasterKey;
@Parameterized.Parameter(2)
public String expectedGroupId;
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][]{
{"00000000000000000000000000000000", "dbde68f4ee9169081f8814eabc65523fea1359235c8cfca32b69e31dce58b039", "__signal_group__v2__!10dc4a74082c2dfe849f0f3e7be03d21150dd5333b2ab9233d40d9d7d8ff74f3"},
{"000102030405060708090a0b0c0d0e0f", "70884f78f07a94480ee36b67a4b5e975e92e4a774561e3df84c9076e3be4b9bf", "__signal_group__v2__!5c71c128f68b5facd4749f8796d4585c5c3d7fd1fe978122eaa3566e8759ebba"},
{"7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f", "e69bf7c183b288b4ea5745b7c52b651a61e57769fafde683a6fdf1240f1905f2", "__signal_group__v2__!f21c4aaa4b29248cb5f80958307de2d805296551f1272cf7286de6c874e00a46"},
{"ffffffffffffffffffffffffffffffff", "dd3a7de23d10f18b64457fbeedc76226c112a730e4b76112e62c36c4432eb37d", "__signal_group__v2__!9d552517683101828fb409c197f7ee1f81feb786f00c066ca0821dece5b29174"}
});
}
@Test
public void deriveMigrationV2MasterKey() {
GroupId.V1 groupV1Id = GroupId.v1orThrow(Hex.fromStringOrThrow(inputV1GroupId));
GroupMasterKey migratedGroupMasterKey = groupV1Id.deriveV2MigrationMasterKey();
assertEquals(expectedMasterKey, Hex.toStringCondensed(migratedGroupMasterKey.serialize()));
}
@Test
public void deriveMigrationV2GroupId() {
GroupId.V1 groupV1Id = GroupId.v1orThrow(Hex.fromStringOrThrow(inputV1GroupId));
GroupId.V2 migratedV2GroupId = groupV1Id.deriveV2MigrationGroupId();
assertEquals(expectedGroupId, migratedV2GroupId.toString());
}
}