diff options
| author | Pauli <pauli@openssl.org> | 2021-12-21 10:17:04 +1100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-12-23 10:51:05 +1100 |
| commit | ceeb92f7b52fbbb349cca8d9560a0708d948936a (patch) | |
| tree | 979e1bdfe3ee56b8eb72fa907b5c185eb4954727 | |
| parent | e0314df5f21dd537602d4ea8d9272a21aac66356 (diff) | |
namemap: handle a NULL return when looking for a non-legacy cipher/MD
Fixes #17313
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17324)
(cherry picked from commit 7a85dd46e0b2f67b341c777509f0126e3252938d)
| -rw-r--r-- | crypto/core_namemap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c index e1da724bd2..2bee5ef194 100644 --- a/crypto/core_namemap.c +++ b/crypto/core_namemap.c @@ -409,14 +409,16 @@ static void get_legacy_cipher_names(const OBJ_NAME *on, void *arg) { const EVP_CIPHER *cipher = (void *)OBJ_NAME_get(on->name, on->type); - get_legacy_evp_names(NID_undef, EVP_CIPHER_get_type(cipher), NULL, arg); + if (cipher != NULL) + get_legacy_evp_names(NID_undef, EVP_CIPHER_get_type(cipher), NULL, arg); } static void get_legacy_md_names(const OBJ_NAME *on, void *arg) { const EVP_MD *md = (void *)OBJ_NAME_get(on->name, on->type); - get_legacy_evp_names(0, EVP_MD_get_type(md), NULL, arg); + if (md != NULL) + get_legacy_evp_names(0, EVP_MD_get_type(md), NULL, arg); } static void get_legacy_pkey_meth_names(const EVP_PKEY_ASN1_METHOD *ameth, |