Commit 4a4578aefb for openssl.org

commit 4a4578aefb481f5d34d8c29a718206fbb0c68373
Author: Norbert Pocs <norbertp@openssl.org>
Date:   Fri Mar 20 18:43:42 2026 +0100

    Simplify ossl_namemap_name2num with ossl_namemap_name2num_n

    The two functions do the same; there is no reason to maintain duplicit
    code.

    Signed-off-by: Norbert Pocs <norbertp@openssl.org>

    Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
    Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
    Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
    MergeDate: Tue Mar 24 17:47:58 2026
    (Merged from https://github.com/openssl/openssl/pull/30524)

diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c
index ae5f42a7e9..7ba228bdc0 100644
--- a/crypto/core_namemap.c
+++ b/crypto/core_namemap.c
@@ -141,28 +141,9 @@ int ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number,

 int ossl_namemap_name2num(const OSSL_NAMEMAP *namemap, const char *name)
 {
-    int number = 0;
-    HT_VALUE *val;
-    NAMENUM_KEY key;
-
-#ifndef FIPS_MODULE
-    if (namemap == NULL)
-        namemap = ossl_namemap_stored(NULL);
-#endif
-
-    if (namemap == NULL || name == NULL)
+    if (name == NULL)
         return 0;
-
-    HT_INIT_RAW_KEY(&key);
-    HT_COPY_RAW_KEY_CASE(TO_HT_KEY(&key), name, strlen(name));
-
-    val = ossl_ht_get(namemap->namenum_ht, TO_HT_KEY(&key));
-
-    if (val != NULL)
-        /* We store a (small) int directly instead of a pointer to it. */
-        number = (int)(intptr_t)val->value;
-
-    return number;
+    return ossl_namemap_name2num_n(namemap, name, strlen(name));
 }

 int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap,