summaryrefslogtreecommitdiffstats
path: root/crypto/provider_local.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-06-18 12:28:40 +0100
committerMatt Caswell <matt@openssl.org>2021-06-24 14:48:14 +0100
commit1d74203cf5d8542d349fbb2d5f35ad40994dec9f (patch)
treea3c4d976fc41d54db82922e19901dea3c237b4f5 /crypto/provider_local.h
parent8d4dec0d4b3055b4c2e7ece5ac99b67b3e77995e (diff)
Instantiate user-added builtin providers when we need them
Previously we created the provider object for builtin providers at the point that OPENSSL_add_builtin() was called. Instead we delay that until the provider is actually loaded. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15854)
Diffstat (limited to 'crypto/provider_local.h')
-rw-r--r--crypto/provider_local.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/provider_local.h b/crypto/provider_local.h
index 12baf032f1..8ac692130f 100644
--- a/crypto/provider_local.h
+++ b/crypto/provider_local.h
@@ -9,10 +9,10 @@
#include <openssl/core.h>
-struct predefined_providers_st {
- const char *name;
+struct provider_info_st {
+ char *name;
OSSL_provider_init_fn *init;
unsigned int is_fallback:1;
};
-extern const struct predefined_providers_st ossl_predefined_providers[];
+extern const struct provider_info_st ossl_predefined_providers[];