Add ossl_lhash symbols

Partial fix for #12964

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

diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c
index 1cc76bf030be9a15cad1bb26152c1cd79714ef7c..ae9aa19c3fd5b21eb18cf3a3e13f53a380ac04c9 100644 (file)
--- a/crypto/core_namemap.c
+++ b/crypto/core_namemap.c
@@ -10,7 +10,7 @@
 #include "e_os.h"                /* strcasecmp */
 #include "internal/namemap.h"
 #include <openssl/lhash.h>
-#include "crypto/lhash.h"      /* openssl_lh_strcasehash */
+#include "crypto/lhash.h"      /* ossl_lh_strcasehash */
 #include "internal/tsan_assist.h"
 
 /*-
@@ -47,7 +47,7 @@ struct ossl_namemap_st {
 
 static unsigned long namenum_hash(const NAMENUM_ENTRY *n)
 {
-    return openssl_lh_strcasehash(n->name);
+    return ossl_lh_strcasehash(n->name);
 }
 
 static int namenum_cmp(const NAMENUM_ENTRY *a, const NAMENUM_ENTRY *b)

diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index 77754187a7792aaae527a067b6a85b4b5288c41d..c8a30fd77d6b6efa1e6c48f76ed2ac3c45da7a88 100644 (file)
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -360,7 +360,7 @@ unsigned long OPENSSL_LH_strhash(const char *c)
     return (ret >> 16) ^ ret;
 }
 
-unsigned long openssl_lh_strcasehash(const char *c)
+unsigned long ossl_lh_strcasehash(const char *c)
 {
     unsigned long ret = 0;
     long n;

diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 372f65d1ff05cd1815ca25a08715696b4072ad24..6f277f433882b0fe1ffa4cad3b01ea764087d174 100644 (file)
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -104,7 +104,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
             ret = 0;
             goto out;
         }
-        name_funcs->hash_func = openssl_lh_strcasehash;
+        name_funcs->hash_func = ossl_lh_strcasehash;
         name_funcs->cmp_func = obj_strcasecmp;
         push = sk_NAME_FUNCS_push(name_funcs_stack, name_funcs);
 
@@ -154,7 +154,7 @@ static unsigned long obj_name_hash(const OBJ_NAME *a)
             sk_NAME_FUNCS_value(name_funcs_stack,
                                 a->type)->hash_func(a->name);
     } else {
-        ret = openssl_lh_strcasehash(a->name);
+        ret = ossl_lh_strcasehash(a->name);
     }
     ret ^= a->type;
     return ret;

diff --git a/include/crypto/lhash.h b/include/crypto/lhash.h
index f24838b10ad702edfd1ba1b3654cecf94769af04..0f64869f54ba0e7fdda9146da335a3284f52a804 100644 (file)
--- a/include/crypto/lhash.h
+++ b/include/crypto/lhash.h
@@ -11,6 +11,6 @@
 # define OSSL_CRYPTO_LHASH_H
 # pragma once
 
-unsigned long openssl_lh_strcasehash(const char *);
+unsigned long ossl_lh_strcasehash(const char *);
 
 #endif  /* OSSL_CRYPTO_LHASH_H */