diff options
author | Matt Caswell <matt@openssl.org> | 2021-06-18 12:28:40 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2021-06-24 14:48:14 +0100 |
commit | 1d74203cf5d8542d349fbb2d5f35ad40994dec9f (patch) | |
tree | a3c4d976fc41d54db82922e19901dea3c237b4f5 /crypto/provider_predefined.c | |
parent | 8d4dec0d4b3055b4c2e7ece5ac99b67b3e77995e (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_predefined.c')
-rw-r--r-- | crypto/provider_predefined.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/provider_predefined.c b/crypto/provider_predefined.c index 142a6d97d1..0ef569c06a 100644 --- a/crypto/provider_predefined.c +++ b/crypto/provider_predefined.c @@ -17,7 +17,7 @@ OSSL_provider_init_fn ossl_fips_intern_provider_init; #ifdef STATIC_LEGACY OSSL_provider_init_fn ossl_legacy_provider_init; #endif -const struct predefined_providers_st ossl_predefined_providers[] = { +const struct provider_info_st ossl_predefined_providers[] = { #ifdef FIPS_MODULE { "fips", ossl_fips_intern_provider_init, 1 }, #else |