diff options
| author | Matt Caswell <matt@openssl.org> | 2021-06-18 15:56:54 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-06-24 14:48:14 +0100 |
| commit | 352d482a2990cc04adff48aeda9c080d4a839f1e (patch) | |
| tree | bee0041c8a4b777653125cab5ed8280b19def1b0 /crypto/provider_predefined.c | |
| parent | 1d74203cf5d8542d349fbb2d5f35ad40994dec9f (diff) | |
Instantiate configuration supplied providers when we need them
If provider specified in a config file are not "activated" then we defer
instantiating the provider object until it is actually needed.
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/provider_predefined.c b/crypto/provider_predefined.c index 0ef569c06a..a190f49b2c 100644 --- a/crypto/provider_predefined.c +++ b/crypto/provider_predefined.c @@ -19,14 +19,14 @@ OSSL_provider_init_fn ossl_legacy_provider_init; #endif const struct provider_info_st ossl_predefined_providers[] = { #ifdef FIPS_MODULE - { "fips", ossl_fips_intern_provider_init, 1 }, + { "fips", NULL, ossl_fips_intern_provider_init, NULL, 1 }, #else - { "default", ossl_default_provider_init, 1 }, + { "default", NULL, ossl_default_provider_init, NULL, 1 }, # ifdef STATIC_LEGACY - { "legacy", ossl_legacy_provider_init, 0 }, + { "legacy", NULL, ossl_legacy_provider_init, NULL, 0 }, # endif - { "base", ossl_base_provider_init, 0 }, - { "null", ossl_null_provider_init, 0 }, + { "base", NULL, ossl_base_provider_init, NULL, 0 }, + { "null", NULL, ossl_null_provider_init, NULL, 0 }, #endif - { NULL, NULL, 0 } + { NULL, NULL, NULL, NULL, 0 } }; |