Addressed feedback on hex printing and mock -> test signer

buildkite · Aug 29, 2024 · 01baf75 · 01baf75
1 parent 6880862
commit 01baf75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/signature/sign.go b/signature/sign.go
@@ -5,7 +5,6 @@ import (
 	"crypto"
 	"crypto/sha256"
 	"crypto/x509"
-	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -132,7 +131,7 @@ func Sign(_ context.Context, key Key, sf SignedFielder, opts ...Option) (*pipeli
 			return nil, fmt.Errorf("calculating key thumbprint: %w", err)
 		}
 
-		debug(options.logger, "Public Key Thumbprint (sha256): %s", hex.EncodeToString(fingerprint))
+		debug(options.logger, "Public Key Thumbprint (sha256): %x", fingerprint)
 	case crypto.Signer:
 		data, err := x509.MarshalPKIXPublicKey(key.Public())
 		if err != nil {
@@ -222,7 +221,7 @@ func Verify(ctx context.Context, s *pipeline.Signature, keySet any, sf SignedFie
 				return fmt.Errorf("calculating key thumbprint: %w", err)
 			}
 
-			debug(options.logger, "Public Key Thumbprint (sha256): %s", hex.EncodeToString(fingerprint))
+			debug(options.logger, "Public Key Thumbprint (sha256): %x", fingerprint)
 		}
 
 		keyOpt = jws.WithKeySet(keySet)

diff --git a/signature/sign_test.go b/signature/sign_test.go
@@ -139,20 +139,20 @@ func TestSignVerify(t *testing.T) {
 	}
 }
 
-var _ crypto.Signer = MockCryptoSigner{}
+var _ crypto.Signer = testECDSASigner{}
 
-type MockCryptoSigner struct {
+type testECDSASigner struct {
 	privateKey crypto.PrivateKey
 	publickKey crypto.PublicKey
 }
 
-func (m MockCryptoSigner) Public() crypto.PublicKey { return m.publickKey }
+func (m testECDSASigner) Public() crypto.PublicKey { return m.publickKey }
 
-func (m MockCryptoSigner) Sign(rand io.Reader, digest []byte, opts crypto.SignerOpts) ([]byte, error) {
+func (m testECDSASigner) Sign(rand io.Reader, digest []byte, opts crypto.SignerOpts) ([]byte, error) {
 	return ecdsa.SignASN1(rand, m.privateKey.(*ecdsa.PrivateKey), digest)
 }
 
-func (m MockCryptoSigner) Algorithm() jwa.KeyAlgorithm {
+func (m testECDSASigner) Algorithm() jwa.KeyAlgorithm {
 	return jwa.ES256
 }
 
@@ -237,7 +237,7 @@ func TestSignVerifyCryptoSigner(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			sKey := MockCryptoSigner{
+			sKey := testECDSASigner{
 				privateKey: privateKey,
 				publickKey: publicKey,
 			}