Version 2 tests.
This commit is contained in:
Alan Evans
parent
3662b6d705
commit
74ebb401b1
@ -10,31 +10,63 @@ import java.util.Arrays;
|
||||
|
||||
public class NumericFingerprintGeneratorTest extends TestCase {
|
||||
|
||||
private static final int VERSION = 1;
|
||||
private static final byte[] ALICE_IDENTITY = {(byte) 0x05, (byte) 0x06, (byte) 0x86, (byte) 0x3b, (byte) 0xc6, (byte) 0x6d, (byte) 0x02, (byte) 0xb4, (byte) 0x0d, (byte) 0x27, (byte) 0xb8, (byte) 0xd4, (byte) 0x9c, (byte) 0xa7, (byte) 0xc0, (byte) 0x9e, (byte) 0x92, (byte) 0x39, (byte) 0x23, (byte) 0x6f, (byte) 0x9d, (byte) 0x7d, (byte) 0x25, (byte) 0xd6, (byte) 0xfc, (byte) 0xca, (byte) 0x5c, (byte) 0xe1, (byte) 0x3c, (byte) 0x70, (byte) 0x64, (byte) 0xd8, (byte) 0x68};
|
||||
private static final byte[] BOB_IDENTITY = {(byte) 0x05, (byte) 0xf7, (byte) 0x81, (byte) 0xb6, (byte) 0xfb, (byte) 0x32, (byte) 0xfe, (byte) 0xd9, (byte) 0xba, (byte) 0x1c, (byte) 0xf2, (byte) 0xde, (byte) 0x97, (byte) 0x8d, (byte) 0x4d, (byte) 0x5d, (byte) 0xa2, (byte) 0x8d, (byte) 0xc3, (byte) 0x40, (byte) 0x46, (byte) 0xae, (byte) 0x81, (byte) 0x44, (byte) 0x02, (byte) 0xb5, (byte) 0xc0, (byte) 0xdb, (byte) 0xd9, (byte) 0x6f, (byte) 0xda, (byte) 0x90, (byte) 0x7b};
|
||||
private static final String DISPLAYABLE_FINGERPRINT = "300354477692869396892869876765458257569162576843440918079131";
|
||||
private static final byte[] ALICE_SCANNABLE_FINGERPRINT = new byte[]{(byte)0x08, (byte)0x01, (byte)0x12, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0x1e, (byte)0x30, (byte)0x1a, (byte)0x03, (byte)0x53, (byte)0xdc, (byte)0xe3, (byte)0xdb, (byte)0xe7, (byte)0x68, (byte)0x4c, (byte)0xb8, (byte)0x33, (byte)0x6e, (byte)0x85, (byte)0x13, (byte)0x6c, (byte)0xdc, (byte)0x0e, (byte)0xe9, (byte)0x62, (byte)0x19, (byte)0x49, (byte)0x4a, (byte)0xda, (byte)0x30, (byte)0x5d, (byte)0x62, (byte)0xa7, (byte)0xbd, (byte)0x61, (byte)0xdf, (byte)0x1a, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0xd6, (byte)0x2c, (byte)0xbf, (byte)0x73, (byte)0xa1, (byte)0x15, (byte)0x92, (byte)0x01, (byte)0x5b, (byte)0x6b, (byte)0x9f, (byte)0x16, (byte)0x82, (byte)0xac, (byte)0x30, (byte)0x6f, (byte)0xea, (byte)0x3a, (byte)0xaf, (byte)0x38, (byte)0x85, (byte)0xb8, (byte)0x4d, (byte)0x12, (byte)0xbc, (byte)0xa6, (byte)0x31, (byte)0xe9, (byte)0xd4, (byte)0xfb, (byte)0x3a, (byte)0x4d};
|
||||
private static final byte[] BOB_SCANNABLE_FINGERPRINT = new byte[]{(byte)0x08, (byte)0x01, (byte)0x12, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0xd6, (byte)0x2c, (byte)0xbf, (byte)0x73, (byte)0xa1, (byte)0x15, (byte)0x92, (byte)0x01, (byte)0x5b, (byte)0x6b, (byte)0x9f, (byte)0x16, (byte)0x82, (byte)0xac, (byte)0x30, (byte)0x6f, (byte)0xea, (byte)0x3a, (byte)0xaf, (byte)0x38, (byte)0x85, (byte)0xb8, (byte)0x4d, (byte)0x12, (byte)0xbc, (byte)0xa6, (byte)0x31, (byte)0xe9, (byte)0xd4, (byte)0xfb, (byte)0x3a, (byte)0x4d, (byte)0x1a, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0x1e, (byte)0x30, (byte)0x1a, (byte)0x03, (byte)0x53, (byte)0xdc, (byte)0xe3, (byte)0xdb, (byte)0xe7, (byte)0x68, (byte)0x4c, (byte)0xb8, (byte)0x33, (byte)0x6e, (byte)0x85, (byte)0x13, (byte)0x6c, (byte)0xdc, (byte)0x0e, (byte)0xe9, (byte)0x62, (byte)0x19, (byte)0x49, (byte)0x4a, (byte)0xda, (byte)0x30, (byte)0x5d, (byte)0x62, (byte)0xa7, (byte)0xbd, (byte)0x61, (byte)0xdf};
|
||||
private static final byte[] ALICE_IDENTITY = {(byte) 0x05, (byte) 0x06, (byte) 0x86, (byte) 0x3b, (byte) 0xc6, (byte) 0x6d, (byte) 0x02, (byte) 0xb4, (byte) 0x0d, (byte) 0x27, (byte) 0xb8, (byte) 0xd4, (byte) 0x9c, (byte) 0xa7, (byte) 0xc0, (byte) 0x9e, (byte) 0x92, (byte) 0x39, (byte) 0x23, (byte) 0x6f, (byte) 0x9d, (byte) 0x7d, (byte) 0x25, (byte) 0xd6, (byte) 0xfc, (byte) 0xca, (byte) 0x5c, (byte) 0xe1, (byte) 0x3c, (byte) 0x70, (byte) 0x64, (byte) 0xd8, (byte) 0x68};
|
||||
private static final byte[] BOB_IDENTITY = {(byte) 0x05, (byte) 0xf7, (byte) 0x81, (byte) 0xb6, (byte) 0xfb, (byte) 0x32, (byte) 0xfe, (byte) 0xd9, (byte) 0xba, (byte) 0x1c, (byte) 0xf2, (byte) 0xde, (byte) 0x97, (byte) 0x8d, (byte) 0x4d, (byte) 0x5d, (byte) 0xa2, (byte) 0x8d, (byte) 0xc3, (byte) 0x40, (byte) 0x46, (byte) 0xae, (byte) 0x81, (byte) 0x44, (byte) 0x02, (byte) 0xb5, (byte) 0xc0, (byte) 0xdb, (byte) 0xd9, (byte) 0x6f, (byte) 0xda, (byte) 0x90, (byte) 0x7b};
|
||||
|
||||
public void testVectors() throws Exception {
|
||||
private static final int VERSION_1 = 1;
|
||||
private static final String DISPLAYABLE_FINGERPRINT_V1 = "300354477692869396892869876765458257569162576843440918079131";
|
||||
private static final byte[] ALICE_SCANNABLE_FINGERPRINT_V1 = new byte[]{(byte)0x08, (byte)0x01, (byte)0x12, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0x1e, (byte)0x30, (byte)0x1a, (byte)0x03, (byte)0x53, (byte)0xdc, (byte)0xe3, (byte)0xdb, (byte)0xe7, (byte)0x68, (byte)0x4c, (byte)0xb8, (byte)0x33, (byte)0x6e, (byte)0x85, (byte)0x13, (byte)0x6c, (byte)0xdc, (byte)0x0e, (byte)0xe9, (byte)0x62, (byte)0x19, (byte)0x49, (byte)0x4a, (byte)0xda, (byte)0x30, (byte)0x5d, (byte)0x62, (byte)0xa7, (byte)0xbd, (byte)0x61, (byte)0xdf, (byte)0x1a, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0xd6, (byte)0x2c, (byte)0xbf, (byte)0x73, (byte)0xa1, (byte)0x15, (byte)0x92, (byte)0x01, (byte)0x5b, (byte)0x6b, (byte)0x9f, (byte)0x16, (byte)0x82, (byte)0xac, (byte)0x30, (byte)0x6f, (byte)0xea, (byte)0x3a, (byte)0xaf, (byte)0x38, (byte)0x85, (byte)0xb8, (byte)0x4d, (byte)0x12, (byte)0xbc, (byte)0xa6, (byte)0x31, (byte)0xe9, (byte)0xd4, (byte)0xfb, (byte)0x3a, (byte)0x4d};
|
||||
private static final byte[] BOB_SCANNABLE_FINGERPRINT_V1 = new byte[]{(byte)0x08, (byte)0x01, (byte)0x12, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0xd6, (byte)0x2c, (byte)0xbf, (byte)0x73, (byte)0xa1, (byte)0x15, (byte)0x92, (byte)0x01, (byte)0x5b, (byte)0x6b, (byte)0x9f, (byte)0x16, (byte)0x82, (byte)0xac, (byte)0x30, (byte)0x6f, (byte)0xea, (byte)0x3a, (byte)0xaf, (byte)0x38, (byte)0x85, (byte)0xb8, (byte)0x4d, (byte)0x12, (byte)0xbc, (byte)0xa6, (byte)0x31, (byte)0xe9, (byte)0xd4, (byte)0xfb, (byte)0x3a, (byte)0x4d, (byte)0x1a, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0x1e, (byte)0x30, (byte)0x1a, (byte)0x03, (byte)0x53, (byte)0xdc, (byte)0xe3, (byte)0xdb, (byte)0xe7, (byte)0x68, (byte)0x4c, (byte)0xb8, (byte)0x33, (byte)0x6e, (byte)0x85, (byte)0x13, (byte)0x6c, (byte)0xdc, (byte)0x0e, (byte)0xe9, (byte)0x62, (byte)0x19, (byte)0x49, (byte)0x4a, (byte)0xda, (byte)0x30, (byte)0x5d, (byte)0x62, (byte)0xa7, (byte)0xbd, (byte)0x61, (byte)0xdf};
|
||||
|
||||
private static final int VERSION_2 = 2;
|
||||
private static final String DISPLAYABLE_FINGERPRINT_V2 = DISPLAYABLE_FINGERPRINT_V1;
|
||||
private static final byte[] ALICE_SCANNABLE_FINGERPRINT_V2 = new byte[]{(byte)0x08, (byte)0x02, (byte)0x12, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0x1e, (byte)0x30, (byte)0x1a, (byte)0x03, (byte)0x53, (byte)0xdc, (byte)0xe3, (byte)0xdb, (byte)0xe7, (byte)0x68, (byte)0x4c, (byte)0xb8, (byte)0x33, (byte)0x6e, (byte)0x85, (byte)0x13, (byte)0x6c, (byte)0xdc, (byte)0x0e, (byte)0xe9, (byte)0x62, (byte)0x19, (byte)0x49, (byte)0x4a, (byte)0xda, (byte)0x30, (byte)0x5d, (byte)0x62, (byte)0xa7, (byte)0xbd, (byte)0x61, (byte)0xdf, (byte)0x1a, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0xd6, (byte)0x2c, (byte)0xbf, (byte)0x73, (byte)0xa1, (byte)0x15, (byte)0x92, (byte)0x01, (byte)0x5b, (byte)0x6b, (byte)0x9f, (byte)0x16, (byte)0x82, (byte)0xac, (byte)0x30, (byte)0x6f, (byte)0xea, (byte)0x3a, (byte)0xaf, (byte)0x38, (byte)0x85, (byte)0xb8, (byte)0x4d, (byte)0x12, (byte)0xbc, (byte)0xa6, (byte)0x31, (byte)0xe9, (byte)0xd4, (byte)0xfb, (byte)0x3a, (byte)0x4d};
|
||||
private static final byte[] BOB_SCANNABLE_FINGERPRINT_V2 = new byte[]{(byte)0x08, (byte)0x02, (byte)0x12, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0xd6, (byte)0x2c, (byte)0xbf, (byte)0x73, (byte)0xa1, (byte)0x15, (byte)0x92, (byte)0x01, (byte)0x5b, (byte)0x6b, (byte)0x9f, (byte)0x16, (byte)0x82, (byte)0xac, (byte)0x30, (byte)0x6f, (byte)0xea, (byte)0x3a, (byte)0xaf, (byte)0x38, (byte)0x85, (byte)0xb8, (byte)0x4d, (byte)0x12, (byte)0xbc, (byte)0xa6, (byte)0x31, (byte)0xe9, (byte)0xd4, (byte)0xfb, (byte)0x3a, (byte)0x4d, (byte)0x1a, (byte)0x22, (byte)0x0a, (byte)0x20, (byte)0x1e, (byte)0x30, (byte)0x1a, (byte)0x03, (byte)0x53, (byte)0xdc, (byte)0xe3, (byte)0xdb, (byte)0xe7, (byte)0x68, (byte)0x4c, (byte)0xb8, (byte)0x33, (byte)0x6e, (byte)0x85, (byte)0x13, (byte)0x6c, (byte)0xdc, (byte)0x0e, (byte)0xe9, (byte)0x62, (byte)0x19, (byte)0x49, (byte)0x4a, (byte)0xda, (byte)0x30, (byte)0x5d, (byte)0x62, (byte)0xa7, (byte)0xbd, (byte)0x61, (byte)0xdf};
|
||||
|
||||
public void testVectorsVersion1() throws Exception {
|
||||
IdentityKey aliceIdentityKey = new IdentityKey(ALICE_IDENTITY, 0);
|
||||
IdentityKey bobIdentityKey = new IdentityKey(BOB_IDENTITY, 0);
|
||||
byte[] aliceStableId = "+14152222222".getBytes();
|
||||
byte[] bobStableId = "+14153333333".getBytes();
|
||||
|
||||
NumericFingerprintGenerator generator = new NumericFingerprintGenerator(5200);
|
||||
Fingerprint aliceFingerprint = generator.createFor(VERSION,
|
||||
"+14152222222".getBytes(), aliceIdentityKey,
|
||||
"+14153333333".getBytes(), bobIdentityKey);
|
||||
NumericFingerprintGenerator generator = new NumericFingerprintGenerator(5200);
|
||||
|
||||
Fingerprint bobFingerprint = generator.createFor(VERSION,
|
||||
"+14153333333".getBytes(), bobIdentityKey,
|
||||
"+14152222222".getBytes(), aliceIdentityKey);
|
||||
Fingerprint aliceFingerprint = generator.createFor(VERSION_1,
|
||||
aliceStableId, aliceIdentityKey,
|
||||
bobStableId, bobIdentityKey);
|
||||
|
||||
assertEquals(aliceFingerprint.getDisplayableFingerprint().getDisplayText(), DISPLAYABLE_FINGERPRINT);
|
||||
assertEquals(bobFingerprint.getDisplayableFingerprint().getDisplayText(), DISPLAYABLE_FINGERPRINT);
|
||||
Fingerprint bobFingerprint = generator.createFor(VERSION_1,
|
||||
bobStableId, bobIdentityKey,
|
||||
aliceStableId, aliceIdentityKey);
|
||||
|
||||
assertTrue(Arrays.equals(aliceFingerprint.getScannableFingerprint().getSerialized(), ALICE_SCANNABLE_FINGERPRINT));
|
||||
assertTrue(Arrays.equals(bobFingerprint.getScannableFingerprint().getSerialized(), BOB_SCANNABLE_FINGERPRINT));
|
||||
assertEquals(aliceFingerprint.getDisplayableFingerprint().getDisplayText(), DISPLAYABLE_FINGERPRINT_V1);
|
||||
assertEquals(bobFingerprint.getDisplayableFingerprint().getDisplayText(), DISPLAYABLE_FINGERPRINT_V1);
|
||||
|
||||
assertTrue(Arrays.equals(aliceFingerprint.getScannableFingerprint().getSerialized(), ALICE_SCANNABLE_FINGERPRINT_V1));
|
||||
assertTrue(Arrays.equals(bobFingerprint.getScannableFingerprint().getSerialized(), BOB_SCANNABLE_FINGERPRINT_V1));
|
||||
}
|
||||
|
||||
public void testVectorsVersion2() throws Exception {
|
||||
IdentityKey aliceIdentityKey = new IdentityKey(ALICE_IDENTITY, 0);
|
||||
IdentityKey bobIdentityKey = new IdentityKey(BOB_IDENTITY, 0);
|
||||
byte[] aliceStableId = "+14152222222".getBytes();
|
||||
byte[] bobStableId = "+14153333333".getBytes();
|
||||
|
||||
NumericFingerprintGenerator generator = new NumericFingerprintGenerator(5200);
|
||||
|
||||
Fingerprint aliceFingerprint = generator.createFor(VERSION_2,
|
||||
aliceStableId, aliceIdentityKey,
|
||||
bobStableId, bobIdentityKey);
|
||||
|
||||
Fingerprint bobFingerprint = generator.createFor(VERSION_2,
|
||||
bobStableId, bobIdentityKey,
|
||||
aliceStableId, aliceIdentityKey);
|
||||
|
||||
assertEquals(aliceFingerprint.getDisplayableFingerprint().getDisplayText(), DISPLAYABLE_FINGERPRINT_V2);
|
||||
assertEquals(bobFingerprint.getDisplayableFingerprint().getDisplayText(), DISPLAYABLE_FINGERPRINT_V2);
|
||||
|
||||
assertTrue(Arrays.equals(aliceFingerprint.getScannableFingerprint().getSerialized(), ALICE_SCANNABLE_FINGERPRINT_V2));
|
||||
assertTrue(Arrays.equals(bobFingerprint.getScannableFingerprint().getSerialized(), BOB_SCANNABLE_FINGERPRINT_V2));
|
||||
}
|
||||
|
||||
public void testMatchingFingerprints() throws FingerprintVersionMismatchException, FingerprintIdentifierMismatchException, FingerprintParsingException {
|
||||
@ -45,11 +77,11 @@ public class NumericFingerprintGeneratorTest extends TestCase {
|
||||
IdentityKey bobIdentityKey = new IdentityKey(bobKeyPair.getPublicKey());
|
||||
|
||||
NumericFingerprintGenerator generator = new NumericFingerprintGenerator(1024);
|
||||
Fingerprint aliceFingerprint = generator.createFor(VERSION,
|
||||
Fingerprint aliceFingerprint = generator.createFor(VERSION_1,
|
||||
"+14152222222".getBytes(), aliceIdentityKey,
|
||||
"+14153333333".getBytes(), bobIdentityKey);
|
||||
|
||||
Fingerprint bobFingerprint = generator.createFor(VERSION,
|
||||
Fingerprint bobFingerprint = generator.createFor(VERSION_1,
|
||||
"+14153333333".getBytes(), bobIdentityKey,
|
||||
"+14152222222".getBytes(), aliceIdentityKey);
|
||||
|
||||
@ -72,16 +104,16 @@ public class NumericFingerprintGeneratorTest extends TestCase {
|
||||
IdentityKey mitmIdentityKey = new IdentityKey(mitmKeyPair.getPublicKey());
|
||||
|
||||
NumericFingerprintGenerator generator = new NumericFingerprintGenerator(1024);
|
||||
Fingerprint aliceFingerprint = generator.createFor(VERSION,
|
||||
Fingerprint aliceFingerprint = generator.createFor(VERSION_1,
|
||||
"+14152222222".getBytes(), aliceIdentityKey,
|
||||
"+14153333333".getBytes(), mitmIdentityKey);
|
||||
|
||||
Fingerprint bobFingerprint = generator.createFor(VERSION,
|
||||
Fingerprint bobFingerprint = generator.createFor(VERSION_1,
|
||||
"+14153333333".getBytes(), bobIdentityKey,
|
||||
"+14152222222".getBytes(), aliceIdentityKey);
|
||||
|
||||
assertNotSame(aliceFingerprint.getDisplayableFingerprint().getDisplayText(),
|
||||
bobFingerprint.getDisplayableFingerprint().getDisplayText());
|
||||
assertFalse(aliceFingerprint.getDisplayableFingerprint().getDisplayText().equals(
|
||||
bobFingerprint.getDisplayableFingerprint().getDisplayText()));
|
||||
|
||||
assertFalse(aliceFingerprint.getScannableFingerprint().compareTo(bobFingerprint.getScannableFingerprint().getSerialized()));
|
||||
assertFalse(bobFingerprint.getScannableFingerprint().compareTo(aliceFingerprint.getScannableFingerprint().getSerialized()));
|
||||
@ -95,19 +127,43 @@ public class NumericFingerprintGeneratorTest extends TestCase {
|
||||
IdentityKey bobIdentityKey = new IdentityKey(bobKeyPair.getPublicKey());
|
||||
|
||||
NumericFingerprintGenerator generator = new NumericFingerprintGenerator(1024);
|
||||
Fingerprint aliceFingerprint = generator.createFor(VERSION,
|
||||
Fingerprint aliceFingerprint = generator.createFor(VERSION_1,
|
||||
"+141512222222".getBytes(), aliceIdentityKey,
|
||||
"+14153333333".getBytes(), bobIdentityKey);
|
||||
|
||||
Fingerprint bobFingerprint = generator.createFor(VERSION,
|
||||
Fingerprint bobFingerprint = generator.createFor(VERSION_1,
|
||||
"+14153333333".getBytes(), bobIdentityKey,
|
||||
"+14152222222".getBytes(), aliceIdentityKey);
|
||||
|
||||
assertNotSame(aliceFingerprint.getDisplayableFingerprint().getDisplayText(),
|
||||
bobFingerprint.getDisplayableFingerprint().getDisplayText());
|
||||
assertFalse(aliceFingerprint.getDisplayableFingerprint().getDisplayText().equals(
|
||||
bobFingerprint.getDisplayableFingerprint().getDisplayText()));
|
||||
|
||||
assertFalse(aliceFingerprint.getScannableFingerprint().compareTo(bobFingerprint.getScannableFingerprint().getSerialized()));
|
||||
assertFalse(bobFingerprint.getScannableFingerprint().compareTo(aliceFingerprint.getScannableFingerprint().getSerialized()));
|
||||
}
|
||||
|
||||
public void testDifferentVersionsMakeSameFingerPrintsButDifferentScannable() throws Exception {
|
||||
IdentityKey aliceIdentityKey = new IdentityKey(ALICE_IDENTITY, 0);
|
||||
IdentityKey bobIdentityKey = new IdentityKey(BOB_IDENTITY, 0);
|
||||
byte[] aliceStableId = "+14152222222".getBytes();
|
||||
byte[] bobStableId = "+14153333333".getBytes();
|
||||
|
||||
NumericFingerprintGenerator generator = new NumericFingerprintGenerator(5200);
|
||||
|
||||
Fingerprint aliceFingerprintV1 = generator.createFor(VERSION_1,
|
||||
aliceStableId, aliceIdentityKey,
|
||||
bobStableId, bobIdentityKey);
|
||||
|
||||
Fingerprint aliceFingerprintV2 = generator.createFor(VERSION_2,
|
||||
aliceStableId, aliceIdentityKey,
|
||||
bobStableId, bobIdentityKey);
|
||||
|
||||
|
||||
assertTrue(aliceFingerprintV1.getDisplayableFingerprint().getDisplayText().equals(
|
||||
aliceFingerprintV2.getDisplayableFingerprint().getDisplayText()));
|
||||
|
||||
assertFalse(Arrays.equals(aliceFingerprintV1.getScannableFingerprint().getSerialized(),
|
||||
aliceFingerprintV2.getScannableFingerprint().getSerialized()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user