summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTomas Mraz <tomas@openssl.org>2024-05-27 16:50:05 +0200
committerTomas Mraz <tomas@openssl.org>2024-08-21 15:21:26 +0200
commit4cad608509855a7c181a856d64084c97aee80589 (patch)
tree0b4eac3d75584d0f6b5b2c6efa07876c79c02b55 /include
parenthashtable: Support lockless reads (diff)
downloadopenssl-4cad608509855a7c181a856d64084c97aee80589.tar.xz
openssl-4cad608509855a7c181a856d64084c97aee80589.zip
Use the new hashtable for core_namemap
This replaces LHASH in core_namemap with the new hashtable and adds a reverse mapping in form of stack of stacks instead of iterating the existing hash table members. The new hashtable is used in lockless-read mode. Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> (Merged from https://github.com/openssl/openssl/pull/24504)
Diffstat (limited to 'include')
-rw-r--r--include/crypto/cryptoerr.h2
-rw-r--r--include/internal/namemap.h2
-rw-r--r--include/openssl/cryptoerr.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/include/crypto/cryptoerr.h b/include/crypto/cryptoerr.h
index 1b6192e3f0..d7df9a2c02 100644
--- a/include/crypto/cryptoerr.h
+++ b/include/crypto/cryptoerr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/include/internal/namemap.h b/include/internal/namemap.h
index 6c42a9cd7c..adfc76c3c3 100644
--- a/include/internal/namemap.h
+++ b/include/internal/namemap.h
@@ -13,7 +13,7 @@ typedef struct ossl_namemap_st OSSL_NAMEMAP;
OSSL_NAMEMAP *ossl_namemap_stored(OSSL_LIB_CTX *libctx);
-OSSL_NAMEMAP *ossl_namemap_new(void);
+OSSL_NAMEMAP *ossl_namemap_new(OSSL_LIB_CTX *libctx);
void ossl_namemap_free(OSSL_NAMEMAP *namemap);
int ossl_namemap_empty(OSSL_NAMEMAP *namemap);
diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
index e84b12df6d..7fa79cf385 100644
--- a/include/openssl/cryptoerr.h
+++ b/include/openssl/cryptoerr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define CRYPTO_R_SECURE_MALLOC_FAILURE 111
# define CRYPTO_R_STRING_TOO_LONG 112
# define CRYPTO_R_TOO_MANY_BYTES 113
+# define CRYPTO_R_TOO_MANY_NAMES 132
# define CRYPTO_R_TOO_MANY_RECORDS 114
# define CRYPTO_R_TOO_SMALL_BUFFER 116
# define CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION 120