From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 18 Mar 2021 13:22:20 +0000 (+0100)
Subject: EVP_PKEY_get_*_param should work with legacy
X-Git-Tag: openssl-3.0.0-alpha14~208
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6084b5c2c9ab5a167d808d6f6c9b21f98c99bbc2;p=thirdparty%2Fopenssl.git

EVP_PKEY_get_*_param should work with legacy

Also do not shortcut the pkey == NULL case
to allow EVP_PKEY_get_params() to raise an error.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14606)
---

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 620c8281591..4abecdf30c3 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -1980,9 +1980,7 @@ int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name,
     size_t buf_sz = 0;
 
     if (key_name == NULL
-        || bn == NULL
-        || pkey == NULL
-        || !evp_pkey_is_provided(pkey))
+        || bn == NULL)
         return 0;
 
     memset(buffer, 0, sizeof(buffer));
@@ -2021,9 +2019,7 @@ int EVP_PKEY_get_octet_string_param(const EVP_PKEY *pkey, const char *key_name,
     OSSL_PARAM params[2];
     int ret1 = 0, ret2 = 0;
 
-    if (key_name == NULL
-        || pkey == NULL
-        || !evp_pkey_is_provided(pkey))
+    if (key_name == NULL)
         return 0;
 
     params[0] = OSSL_PARAM_construct_octet_string(key_name, buf, max_buf_sz);