Skip to content
Snippets Groups Projects
Commit f943c19f authored by Jono Wenger's avatar Jono Wenger
Browse files

Remove usage of Fingerprint functions

parent 72e02930
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,8 @@ const responseFPConstant = "responseFPConstant" ...@@ -21,7 +21,8 @@ const responseFPConstant = "responseFPConstant"
// the given key number. // the given key number.
func ResponseFingerprint(dhKey *cyclic.Int, keyNum uint64) format.Fingerprint { func ResponseFingerprint(dhKey *cyclic.Int, keyNum uint64) format.Fingerprint {
// Create 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 // Set the first bit as zero to ensure everything stays in the group
fp[0] &= 0b01111111 fp[0] &= 0b01111111
......
...@@ -24,12 +24,13 @@ func TestResponseFingerprint(t *testing.T) { ...@@ -24,12 +24,13 @@ func TestResponseFingerprint(t *testing.T) {
dhKey := diffieHellman.GeneratePublicKey(diffieHellman.GeneratePrivateKey( dhKey := diffieHellman.GeneratePublicKey(diffieHellman.GeneratePrivateKey(
diffieHellman.DefaultPrivateKeyLength, grp, prng), grp) diffieHellman.DefaultPrivateKeyLength, grp, prng), grp)
testFP := ResponseFingerprint(dhKey, 0) testFP := ResponseFingerprint(dhKey, 0)
testFPb64 := base64.StdEncoding.EncodeToString(testFP[:])
if expectedFP != testFP.String() { if expectedFP != testFPb64 {
t.Errorf("ResponseFingerprint() did not return the expected "+ t.Errorf("ResponseFingerprint() did not return the expected "+
"fingerprint for public key %s."+ "fingerprint for public key %s."+
"\nexpected: %s\nreceived: %s", "\nexpected: %s\nreceived: %s",
dhKey.Text(10), expectedFP, testFP) dhKey.Text(10), expectedFP, testFPb64)
} }
} }
......
...@@ -18,7 +18,8 @@ const transmitFPConstant = "transmitFPConstant" ...@@ -18,7 +18,8 @@ const transmitFPConstant = "transmitFPConstant"
// message. // message.
func TransmitFingerprint(dhKey *cyclic.Int) format.Fingerprint { func TransmitFingerprint(dhKey *cyclic.Int) format.Fingerprint {
// Create 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 // Set the first bit as zero to ensure everything stays in the group
fp[0] &= 0b01111111 fp[0] &= 0b01111111
......
...@@ -38,12 +38,13 @@ func TestTransmitFingerprint_Consistency(t *testing.T) { ...@@ -38,12 +38,13 @@ func TestTransmitFingerprint_Consistency(t *testing.T) {
dhKey := diffieHellman.GeneratePublicKey(diffieHellman.GeneratePrivateKey( dhKey := diffieHellman.GeneratePublicKey(diffieHellman.GeneratePrivateKey(
diffieHellman.DefaultPrivateKeyLength, grp, prng), grp) diffieHellman.DefaultPrivateKeyLength, grp, prng), grp)
testFP := TransmitFingerprint(dhKey) testFP := TransmitFingerprint(dhKey)
testFPb64 := base64.StdEncoding.EncodeToString(testFP[:])
if expected != testFP.String() { if expected != testFPb64 {
t.Errorf("TransmitFingerprint() did not return the expected "+ t.Errorf("TransmitFingerprint() did not return the expected "+
"fingerprint for public key %s at index %d."+ "fingerprint for public key %s at index %d."+
"\nexpected: %s\nreceived: %s", "\nexpected: %s\nreceived: %s",
dhKey.Text(10), i, expected, testFP) dhKey.Text(10), i, expected, testFPb64)
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment