[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  7a85dd46e0b2f67b341c777509f0126e3252938d (commit)
      from  cdaf072f90399efb9e8e19ee4f387d1425f12274 (commit)


- Log -----------------------------------------------------------------
commit 7a85dd46e0b2f67b341c777509f0126e3252938d
Author: Pauli <pauli at openssl.org>
Date:   Tue Dec 21 10:17:04 2021 +1100

    namemap: handle a NULL return when looking for a non-legacy cipher/MD
    
    Fixes #17313
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17324)

-----------------------------------------------------------------------

Summary of changes:
 crypto/core_namemap.c | 6 ++++--
 1 file 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,