diff --git a/e2e/singleUse/responseFingerprint.go b/e2e/singleUse/responseFingerprint.go index 37c84ba95564a551d1042937811912aaadfbcbb0..753ca4aa1697ed2ec344897a0f2f06e514e8c912 100644 --- a/e2e/singleUse/responseFingerprint.go +++ b/e2e/singleUse/responseFingerprint.go @@ -21,7 +21,8 @@ const responseFPConstant = "responseFPConstant" // the given key number. func ResponseFingerprint(dhKey *cyclic.Int, keyNum uint64) format.Fingerprint { // Create fingerprint - fp := format.NewFingerprint(makeKeyHash(dhKey, keyNum, responseFPConstant)) + fp := format.Fingerprint{} + copy(fp[:], makeKeyHash(dhKey, keyNum, responseFPConstant)) // Set the first bit as zero to ensure everything stays in the group fp[0] &= 0b01111111 diff --git a/e2e/singleUse/responseFingerprint_test.go b/e2e/singleUse/responseFingerprint_test.go index 7dd1f932a615d53d6ae446c936657d677766d416..9fe89fa8fec9b9aef0da6ca284abeab855eb4d75 100644 --- a/e2e/singleUse/responseFingerprint_test.go +++ b/e2e/singleUse/responseFingerprint_test.go @@ -24,12 +24,13 @@ func TestResponseFingerprint(t *testing.T) { dhKey := diffieHellman.GeneratePublicKey(diffieHellman.GeneratePrivateKey( diffieHellman.DefaultPrivateKeyLength, grp, prng), grp) testFP := ResponseFingerprint(dhKey, 0) + testFPb64 := base64.StdEncoding.EncodeToString(testFP[:]) - if expectedFP != testFP.String() { + if expectedFP != testFPb64 { t.Errorf("ResponseFingerprint() did not return the expected "+ "fingerprint for public key %s."+ "\nexpected: %s\nreceived: %s", - dhKey.Text(10), expectedFP, testFP) + dhKey.Text(10), expectedFP, testFPb64) } } diff --git a/e2e/singleUse/transmitFingerprint.go b/e2e/singleUse/transmitFingerprint.go index 98a92a9a66338f14fc57b4b8e1e1b50bb833d8df..c246063fd73ba216e2c11dbc0163d142990e9f89 100644 --- a/e2e/singleUse/transmitFingerprint.go +++ b/e2e/singleUse/transmitFingerprint.go @@ -18,7 +18,8 @@ const transmitFPConstant = "transmitFPConstant" // message. func TransmitFingerprint(dhKey *cyclic.Int) format.Fingerprint { // Create fingerprint - fp := format.NewFingerprint(makeHash(dhKey, []byte(transmitFPConstant))) + fp := format.Fingerprint{} + copy(fp[:], makeHash(dhKey, []byte(transmitFPConstant))) // Set the first bit as zero to ensure everything stays in the group fp[0] &= 0b01111111 diff --git a/e2e/singleUse/transmitFingerprint_test.go b/e2e/singleUse/transmitFingerprint_test.go index db1ec5f6064e065aa6fc6a3a3109126d1dcbb6d3..bf09684d7ee3771c6a61bc04ca40e5c74cea8a8d 100644 --- a/e2e/singleUse/transmitFingerprint_test.go +++ b/e2e/singleUse/transmitFingerprint_test.go @@ -38,12 +38,13 @@ func TestTransmitFingerprint_Consistency(t *testing.T) { dhKey := diffieHellman.GeneratePublicKey(diffieHellman.GeneratePrivateKey( diffieHellman.DefaultPrivateKeyLength, grp, prng), grp) testFP := TransmitFingerprint(dhKey) + testFPb64 := base64.StdEncoding.EncodeToString(testFP[:]) - if expected != testFP.String() { + if expected != testFPb64 { t.Errorf("TransmitFingerprint() did not return the expected "+ "fingerprint for public key %s at index %d."+ "\nexpected: %s\nreceived: %s", - dhKey.Text(10), i, expected, testFP) + dhKey.Text(10), i, expected, testFPb64) } } }