diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 13:37:22 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:38 +1000 |
| commit | 285aa80ef1bb3a8e136a88cf41f3b34863409cd2 (patch) | |
| tree | 6353a851d91e498eb986129b71f80a22f0e280a0 | |
| parent | b54cab31d2593421198f75e715b5f851ce24fe6b (diff) | |
Add ossl_lhash symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
| -rw-r--r-- | crypto/core_namemap.c | 4 | ||||
| -rw-r--r-- | crypto/lhash/lhash.c | 2 | ||||
| -rw-r--r-- | crypto/objects/o_names.c | 4 | ||||
| -rw-r--r-- | include/crypto/lhash.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c index 1cc76bf030..ae9aa19c3f 100644 --- 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 77754187a7..c8a30fd77d 100644 --- 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 372f65d1ff..6f277f4338 100644 --- 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 f24838b10a..0f64869f54 100644 --- 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 */ |