commit 20d56d6d62d98c3b2649afd2d20e0c2cc39afce1
author Richard Levitte <levitte@openssl.org> Thu Sep 03 12:42:43 2020 +0200
committer Richard Levitte <levitte@openssl.org> Tue Sep 08 06:26:19 2020 +0200
tree 598ebd2de51c49109cc1e7bcff41a8abf0e204ff
parent 509144964ba69b69a90269da52a2dc3acb3149e6

EVP: Don't shadow EVP_PKEY_CTX_new* error records

There are places that add an ERR_R_MALLOC_FAILURE record when any of
EVP_PKEY_CTX_new*() return NULL, which is 1) inaccurate, and 2)
shadows the more accurate error record generated when trying to create
the EVP_PKEY_CTX.

Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
(Merged from https://github.com/openssl/openssl/pull/12785)

crypto/evp/p_lib.c

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index e22e900..fec4e2d 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -606,10 +606,8 @@
     }
 
     ctx = EVP_PKEY_CTX_new_from_name(libctx, "CMAC", propq);
-    if (ctx == NULL) {
-        EVPerr(0, ERR_R_MALLOC_FAILURE);
+    if (ctx == NULL)
         goto err;
-    }
 
     if (!EVP_PKEY_key_fromdata_init(ctx)) {
         EVPerr(0, EVP_R_KEY_SETUP_FAILED);