From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 3 Jan 2017 16:00:04 +0000 (+0000)
Subject: add parameter error
X-Git-Tag: OpenSSL_1_1_1-pre1~2763
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=635fe50fcd52f92cb2ecd8a23c979a50c70a626b;ds=sidebyside

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)
---

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;