From f943c19f864183fa12b65fd00e2fbb2153554432 Mon Sep 17 00:00:00 2001
From: Jono Wenger <jono@elixxir.io>
Date: Mon, 25 Jan 2021 14:52:16 -0800
Subject: [PATCH] Remove usage of Fingerprint functions
---
e2e/singleUse/responseFingerprint.go | 3 ++-
e2e/singleUse/responseFingerprint_test.go | 5 +++--
e2e/singleUse/transmitFingerprint.go | 3 ++-
e2e/singleUse/transmitFingerprint_test.go | 5 +++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/e2e/singleUse/responseFingerprint.go b/e2e/singleUse/responseFingerprint.go
index 37c84ba9..753ca4aa 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 7dd1f932..9fe89fa8 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 98a92a9a..c246063f 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 db1ec5f6..bf09684d 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)
}
}
}
--
GitLab