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 /crypto/provider_conf.c | |
parent | d5fbd5b4eda592fd43e8688f69f3bac4ca5dd2da (diff) |
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 'crypto/provider_conf.c')
-rw-r--r-- | crypto/provider_conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/provider_conf.c b/crypto/provider_conf.c index 8e83264dc6..1e59e959e3 100644 --- a/crypto/provider_conf.c +++ b/crypto/provider_conf.c @@ -171,9 +171,9 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name, ok = provider_conf_params(prov, NULL, NULL, value, cnf); if (ok) { - if (!ossl_provider_activate(prov, 0, 1)) { + if (!ossl_provider_activate(prov, 1)) { ok = 0; - } else if (!ossl_provider_add_to_store(prov)) { + } else if (!ossl_provider_add_to_store(prov, 0)) { ossl_provider_deactivate(prov); ok = 0; } else { |