summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-01-03 16:00:04 +0000
committerDr. Stephen Henson <steve@openssl.org>2017-01-08 01:42:49 +0000
commit635fe50fcd52f92cb2ecd8a23c979a50c70a626b (patch)
tree9c6a0fd344f78853242f799af6ccdf4df2e17d5a /crypto
parentf7a21d85b6851bdbdc8db1397285d4c63b2c40be (diff)
add parameter error
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2177)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/rsa/rsa_ameth.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 37daed167b..9a8f82e449 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -64,8 +64,10 @@ static int rsa_param_decode(RSA *rsa, const X509_ALGOR *alg)
return 1;
if (algptype == V_ASN1_UNDEF)
return 1;
- if (algptype != V_ASN1_SEQUENCE)
+ if (algptype != V_ASN1_SEQUENCE) {
+ RSAerr(RSA_F_RSA_PARAM_DECODE, RSA_R_INVALID_PSS_PARAMETERS);
return 0;
+ }
rsa->pss = rsa_pss_decode(alg);
if (rsa->pss == NULL)
return 0;