diff options
| author | Matt Caswell <matt@openssl.org> | 2021-06-21 11:34:04 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-06-24 14:48:14 +0100 |
| commit | eb2263da9abf3676cbcac672eee8a26416a8c309 (patch) | |
| tree | deaa7046d31cd09982f119e39ff4a20dbd047891 /include/internal | |
| parent | d5fbd5b4eda592fd43e8688f69f3bac4ca5dd2da (diff) | |
| download | openssl-eb2263da9abf3676cbcac672eee8a26416a8c309.tar.gz | |
Set use_fallbacks to zero when we add a provider to the store
Update use_fallbacks to zero when we add a provider to the store rather
than when we activate it. Its only at the point that we add it to the store
that it is actually usable and visible to other threads.
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 'include/internal')
| -rw-r--r-- | include/internal/provider.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/internal/provider.h b/include/internal/provider.h index 45ad1a5b00..b6e413f7a4 100644 --- a/include/internal/provider.h +++ b/include/internal/provider.h @@ -59,10 +59,9 @@ int ossl_provider_disable_fallback_loading(OSSL_LIB_CTX *libctx); * Activate the Provider * If the Provider is a module, the module will be loaded */ -int ossl_provider_activate(OSSL_PROVIDER *prov, int retain_fallbacks, - int upcalls); +int ossl_provider_activate(OSSL_PROVIDER *prov, int upcalls); int ossl_provider_deactivate(OSSL_PROVIDER *prov); -int ossl_provider_add_to_store(OSSL_PROVIDER *prov); +int ossl_provider_add_to_store(OSSL_PROVIDER *prov, int retain_fallbacks); /* Return pointer to the provider's context */ void *ossl_provider_ctx(const OSSL_PROVIDER *prov); |