Fix linter errors

smallstep · Nov 2, 2023 · 1bca397 · 1bca397
1 parent 95c70eb
commit 1bca397
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tpm/tss2/signer.go b/tpm/tss2/signer.go
@@ -98,7 +98,7 @@ func (s *Signer) Public() crypto.PublicKey {
 	return s.publicKey
 }
 
-func (s *Signer) Sign(rand io.Reader, digest []byte, opts crypto.SignerOpts) (signature []byte, err error) {
+func (s *Signer) Sign(_ io.Reader, digest []byte, opts crypto.SignerOpts) (signature []byte, err error) {
 	parentHandle := tpmutil.Handle(s.tpmKey.Parent)
 	if !handleIsPersistent(s.tpmKey.Parent) {
 		parentHandle, _, err = tpm2.CreatePrimary(s.rw, parentHandle, tpm2.PCRSelection{}, "", "", primaryParams)
@@ -147,7 +147,7 @@ func signECDSA(rw io.ReadWriter, key tpmutil.Handle, digest []byte, curve ellipt
 func signRSA(rw io.ReadWriter, key tpmutil.Handle, digest []byte, opts crypto.SignerOpts) ([]byte, error) {
 	h, err := tpm2.HashToAlgorithm(opts.HashFunc())
 	if err != nil {
-		return nil, fmt.Errorf("incorrect hash algorithm: %v", err)
+		return nil, fmt.Errorf("error getting algorithm: %w", err)
 	}
 
 	scheme := &tpm2.SigScheme{
@@ -164,10 +164,10 @@ func signRSA(rw io.ReadWriter, key tpmutil.Handle, digest []byte, opts crypto.Si
 
 	sig, err := tpm2.Sign(rw, key, "", digest, nil, scheme)
 	if err != nil {
-		return nil, fmt.Errorf("error creating RSA signature: %v", err)
+		return nil, fmt.Errorf("error creating RSA signature: %w", err)
 	}
 	if sig.RSA == nil {
-		return nil, fmt.Errorf("expected RSA signature, got: %v", sig.Alg)
+		return nil, fmt.Errorf("unexpected signature scheme %v", sig.Alg)
 	}
 	return sig.RSA.Signature, nil
 }

diff --git a/tpm/tss2/signer_test.go b/tpm/tss2/signer_test.go
@@ -89,20 +89,20 @@ func TestSign(t *testing.T) {
 			hash.Write([]byte("rulingly-quailed-cloacal-indifferentist-roughhoused-self-mad"))
 			sum := hash.Sum(nil)
 
-			sig, err := signer.Sign(rand.Reader, sum[:], tt.opts)
+			sig, err := signer.Sign(rand.Reader, sum, tt.opts)
 			require.NoError(t, err)
 
 			switch pub := signer.Public().(type) {
 			case *ecdsa.PublicKey:
 				assert.Equal(t, tpm2.AlgECC, tt.params.Type)
-				assert.True(t, ecdsa.VerifyASN1(pub, sum[:], sig))
+				assert.True(t, ecdsa.VerifyASN1(pub, sum, sig))
 			case *rsa.PublicKey:
 				assert.Equal(t, tpm2.AlgRSA, tt.params.Type)
 				switch tt.params.RSAParameters.Sign.Alg {
 				case tpm2.AlgRSASSA:
-					assert.NoError(t, rsa.VerifyPKCS1v15(pub, tt.opts.HashFunc(), sum[:], sig))
+					assert.NoError(t, rsa.VerifyPKCS1v15(pub, tt.opts.HashFunc(), sum, sig))
 				case tpm2.AlgRSAPSS:
-					assert.NoError(t, rsa.VerifyPSS(pub, crypto.SHA256, sum[:], sig, nil))
+					assert.NoError(t, rsa.VerifyPSS(pub, crypto.SHA256, sum, sig, nil))
 				default:
 					t.Errorf("unexpected RSAParameters.Sign.Alg %v", tt.params.RSAParameters.Sign.Alg)
 				}