Refactor Sign/VerifyWithTimestamp to pass in timestamp int64 (unixNano)

registration/timestamp.go

@@ -11,7 +11,6 @@ import (
 	"gitlab.com/xx_network/crypto/signature/rsa"
 	"hash"
 	"io"
-	"time"
 )
 
 // This file handles signature and verification logic of the timestamp for a user's verification.
@@ -19,12 +18,12 @@ import (
 
 // SignWithTimestamp signs a hash of the timestamp and the user's public key
 func SignWithTimestamp(rand io.Reader, priv *rsa.PrivateKey,
-	ts time.Time, userPubKeyPem string) ([]byte, error) {
+	timestampNano int64, userPubKeyPem string) ([]byte, error) {
 	// Construct the hash
 	options := rsa.NewDefaultOptions()
 
 	// Digest the timestamp and public key
-	hashedData := digest(options.Hash.New(), ts, userPubKeyPem)
+	hashedData := digest(options.Hash.New(), timestampNano, userPubKeyPem)
 
 	// Sign the data
 	return rsa.Sign(rand, priv, options.Hash, hashedData, options)
@@ -32,13 +31,13 @@ func SignWithTimestamp(rand io.Reader, priv *rsa.PrivateKey,
 
 // VerifyWithTimestamp verifies the signature provided against serverPubKey and the
 // digest of the timestamp ts and userPubKey
-func VerifyWithTimestamp(sig []byte, serverPubKey *rsa.PublicKey,
-	ts time.Time, userPubKeyPem string) error {
+func VerifyWithTimestamp(serverPubKey *rsa.PublicKey,
+	timestampNano int64, userPubKeyPem string, sig []byte) error {
 	// Construct the hash
 	options := rsa.NewDefaultOptions()
 
 	// Digest the timestamp and public key
-	hashedData := digest(options.Hash.New(), ts, userPubKeyPem)
+	hashedData := digest(options.Hash.New(), timestampNano, userPubKeyPem)
 
 	// Verify the signature
 	return rsa.Verify(serverPubKey, options.Hash, hashedData, sig, options)
@@ -46,12 +45,11 @@ func VerifyWithTimestamp(sig []byte, serverPubKey *rsa.PublicKey,
 
 // digest is a helper function which digests the timestamp ts and
 // rsa.PublicKey userPubKey given hash h
-func digest(h hash.Hash, ts time.Time, userPubKeyPem string) []byte {
-	// Serialize the public key
+func digest(h hash.Hash, timestampNano int64, userPubKeyPem string) []byte {
 
 	// Serialize the timestamp
 	tsBytes := make([]byte, 8)
-	binary.BigEndian.PutUint64(tsBytes, uint64(ts.UnixNano()))
+	binary.BigEndian.PutUint64(tsBytes, uint64(timestampNano))
 
 	// Hash the data and verify
 	h.Write(tsBytes)

registration/timestamp_test.go

@@ -123,7 +123,7 @@ func TestSignVerify(t *testing.T) {
 
 	// Sign data
 	userPubKeyPem := string(rsa.CreatePublicKeyPem(userPrivKey.GetPublic()))
-	sig, err := SignWithTimestamp(notRand, serverPrivKey, testTime, userPubKeyPem)
+	sig, err := SignWithTimestamp(notRand, serverPrivKey, testTime.UnixNano(), userPubKeyPem)
 	if err != nil {
 		t.Fatalf("SignVerify error: "+
 			"Could not sign data: %v", err.Error())
@@ -137,7 +137,7 @@ func TestSignVerify(t *testing.T) {
 	}
 
 	// Test the verification
-	err = VerifyWithTimestamp(sig, serverPrivKey.GetPublic(), testTime, userPubKeyPem)
+	err = VerifyWithTimestamp(serverPrivKey.GetPublic(), testTime.UnixNano(), userPubKeyPem, sig)
 	if err != nil {
 		t.Fatalf("SignVerify error: "+
 			"Could not verify signature: %v", err.Error())
@@ -157,14 +157,14 @@ func TestSignVerify(t *testing.T) {
 			"Could not generate key: %v", err.Error())
 	}
 
-	sig, err = SignWithTimestamp(notRand, serverPrivKey, testTime, userPubKeyPem)
+	sig, err = SignWithTimestamp(notRand, serverPrivKey, testTime.UnixNano(), userPubKeyPem)
 	if err != nil {
 		t.Fatalf("SignVerify error: "+
 			"Could not sign data: %v", err.Error())
 	}
 
 	// Test the verification
-	err = VerifyWithTimestamp(sig, serverPrivKey.GetPublic(), testTime, userPubKeyPem)
+	err = VerifyWithTimestamp(serverPrivKey.GetPublic(), testTime.UnixNano(), userPubKeyPem, sig)
 	if err != nil {
 		t.Fatalf("SignVerify error: "+
 			"Could not verify signature: %v", err.Error())