From 0bcc8ec9d386bc067410f169682cef6b5da4455b Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 5 Mar 2018 19:26:36 +0000 Subject: Make sure all errors go on the stack in the EVP_PKEY_new*() functions Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/5520) --- crypto/evp/p_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index ee121c4..073d2df 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -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; } -- cgit v1.1