diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-03-18 14:22:20 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-03-19 15:09:55 +0100 |
| commit | 6084b5c2c9ab5a167d808d6f6c9b21f98c99bbc2 (patch) | |
| tree | fd1c07e1d84022abb16c56a152a277f46266b2f9 /crypto | |
| parent | 03cd9d2f230fd60af23ed5ccbe8c6e8ad245cd73 (diff) | |
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)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/p_lib.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 620c828159..4abecdf30c 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); |