From 73c9884da63798dd65aa6e375b86d6dc26f44fc7 Mon Sep 17 00:00:00 2001 From: Ramon Petgrave Date: Thu, 20 Jun 2024 22:10:46 +0000 Subject: [PATCH] lint: no pointer for crypto.publickkey Signed-off-by: Ramon Petgrave --- cli/slsa-verifier/verify/verify_vsa.go | 2 +- options/options.go | 2 +- verifiers/internal/vsa/verifier.go | 2 +- verifiers/internal/vsa/vsa_test.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/slsa-verifier/verify/verify_vsa.go b/cli/slsa-verifier/verify/verify_vsa.go index 2c2ddd7..bc5f313 100644 --- a/cli/slsa-verifier/verify/verify_vsa.go +++ b/cli/slsa-verifier/verify/verify_vsa.go @@ -79,7 +79,7 @@ func (c *VerifyVSACommand) Exec(ctx context.Context) (*utils.TrustedAttesterID, return nil, err } VerificationOpts := &options.VerificationOpts{ - PublicKey: &pubKey, + PublicKey: pubKey, PublicKeyID: c.PublicKeyID, PublicKeyHashAlgo: hashHalgo, } diff --git a/options/options.go b/options/options.go index c253119..b1695c5 100644 --- a/options/options.go +++ b/options/options.go @@ -57,7 +57,7 @@ type VSAOpts struct { type VerificationOpts struct { // PublicKey is the public key used to verify the signature on the Envelope - PublicKey *crypto.PublicKey + PublicKey crypto.PublicKey // PublicKeyID is the ID of the public key PublicKeyID *string diff --git a/verifiers/internal/vsa/verifier.go b/verifiers/internal/vsa/verifier.go index e8b4db7..0fa0648 100644 --- a/verifiers/internal/vsa/verifier.go +++ b/verifiers/internal/vsa/verifier.go @@ -72,7 +72,7 @@ func VerifyVSA(ctx context.Context, // verifyEnvelopeSignature verifies the signature of the envelope. func verifyEnvelopeSignature(ctx context.Context, sigstoreEnvelope *sigstoreBundle.Envelope, verificationOpts *options.VerificationOpts) error { - signatureVerifier, err := sigstoreSignature.LoadVerifier(*verificationOpts.PublicKey, verificationOpts.PublicKeyHashAlgo) + signatureVerifier, err := sigstoreSignature.LoadVerifier(verificationOpts.PublicKey, verificationOpts.PublicKeyHashAlgo) if err != nil { return fmt.Errorf("%w: loading sigstore DSSE envolope verifier %w", serrors.ErrorInvalidPublicKey, err) } diff --git a/verifiers/internal/vsa/vsa_test.go b/verifiers/internal/vsa/vsa_test.go index 0a06fdb..0ab7e31 100644 --- a/verifiers/internal/vsa/vsa_test.go +++ b/verifiers/internal/vsa/vsa_test.go @@ -170,7 +170,7 @@ func Test_VerifyVSA(t *testing.T) { } } -func mustPublicKey(path string) *crypto.PublicKey { +func mustPublicKey(path string) crypto.PublicKey { pubKeyBytes, err := os.ReadFile(path) if err != nil { panic(err) @@ -179,7 +179,7 @@ func mustPublicKey(path string) *crypto.PublicKey { if err != nil { panic(err) } - return &pubKey + return pubKey } func PointerTo[K any](object K) *K {