diff --git a/asymmetric.go b/asymmetric.go index 9b82b7c..a17efd9 100644 --- a/asymmetric.go +++ b/asymmetric.go @@ -277,7 +277,9 @@ func (v *rsaVerifier) verify(_ context.Context, payload []byte, signature []byte case RsaPkcs1v15Sha256, RsaPkcs1v15Sha384, RsaPkcs1v15Sha512: err = rsa.VerifyPKCS1v15(v.publicKey, v.hash, hashed, signature) case RsaPssSha256, RsaPssSha384, RsaPssSha512: - err = rsa.VerifyPSS(v.publicKey, v.hash, hashed, signature, nil) + err = rsa.VerifyPSS(v.publicKey, v.hash, hashed, signature, &rsa.PSSOptions{ + SaltLength: rsa.PSSSaltLengthEqualsHash, + }) } if err != nil { diff --git a/asymmetric_test.go b/asymmetric_test.go index 9145b17..98f83bd 100644 --- a/asymmetric_test.go +++ b/asymmetric_test.go @@ -468,6 +468,7 @@ func TestRSAVerifierVerifyPayload(t *testing.T) { alg SignatureAlgorithm mutateMessage func(t *testing.T, message []byte) []byte mutateSignature func(t *testing.T, signature []byte) []byte + pssSaltLength int shouldError bool }{ "2048 key with RsaPkcs1v15Sha256": { @@ -494,6 +495,30 @@ func TestRSAVerifierVerifyPayload(t *testing.T) { key: pk4096, alg: RsaPssSha512, }, + "RsaPssSha256 with short salt": { + key: pk2048, + alg: RsaPssSha256, + pssSaltLength: 1, + shouldError: true, + }, + "RsaPssSha384 with short salt": { + key: pk3072, + alg: RsaPssSha384, + pssSaltLength: 1, + shouldError: true, + }, + "RsaPssSha512 with short salt": { + key: pk4096, + alg: RsaPssSha512, + pssSaltLength: 1, + shouldError: true, + }, + "RsaPssSha512 with long salt": { + key: pk4096, + alg: RsaPssSha512, + pssSaltLength: 65, + shouldError: true, + }, "signature is too short": { shouldError: true, alg: RsaPssSha256, @@ -556,6 +581,16 @@ func TestRSAVerifierVerifyPayload(t *testing.T) { require.NoError(t, err) require.NotEmpty(t, res) + if tc.pssSaltLength > 0 { + hasher := sig.hash.New() + _, _ = hasher.Write(message) + + res, err = rsa.SignPSS(rand.Reader, tc.key, sig.hash, hasher.Sum(nil), &rsa.PSSOptions{ + SaltLength: tc.pssSaltLength, + }) + require.NoError(t, err) + } + ver, err := newRSAVerifier(&tc.key.PublicKey, tc.alg) require.NoError(t, err)