Make sure all errors go on the stack in the EVP_PKEY_new*() functions
authorMatt Caswell <matt@openssl.org>
Mon, 5 Mar 2018 19:26:36 +0000 (19:26 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 15 Mar 2018 12:47:27 +0000 (12:47 +0000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5520)

crypto/evp/p_lib.c

index ee121c4..073d2df 100644 (file)
@@ -239,7 +239,7 @@ EVP_PKEY *EVP_PKEY_new_private_key(int type, ENGINE *e,
     }
 
     if (!ret->ameth->set_priv_key(ret, priv, len)) {
-        /* We assume the method function calls EVPerr */
+        EVPerr(EVP_F_EVP_PKEY_NEW_PRIVATE_KEY, EVP_R_KEY_SETUP_FAILED);
         goto err;
     }
 
@@ -269,7 +269,7 @@ EVP_PKEY *EVP_PKEY_new_public_key(int type, ENGINE *e,
     }
 
     if (!ret->ameth->set_pub_key(ret, pub, len)) {
-        /* We assume the method function calls EVPerr */
+        EVPerr(EVP_F_EVP_PKEY_NEW_PUBLIC_KEY, EVP_R_KEY_SETUP_FAILED);
         goto err;
     }