diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-02-18 09:16:26 +1000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-23 23:24:41 +1000 |
| commit | 299f5ff3b5f2a5a9b5666e36a6a01fc430de9198 (patch) | |
| tree | a522f985b02749c53b628f193c767de3c9fb93f6 /crypto | |
| parent | 332a245c04dff95f81cfa1f77e0f8a935794f5ee (diff) | |
provider: add option to load a provider without disabling the fallbacks.
Add an argument to PROVIDER_try_load() that permits a provider to be
loaded without changing the fallback status. This is useful when an
additional provider needs to be loaded without perturbing any other setup.
E.g. adding mock providers as part of unit testing.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13652)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/provider.c | 7 | ||||
| -rw-r--r-- | crypto/provider_conf.c | 2 | ||||
| -rw-r--r-- | crypto/provider_core.c | 10 |
3 files changed, 11 insertions, 8 deletions
diff --git a/crypto/provider.c b/crypto/provider.c index bd8f75a2c1..90c31f3ac5 100644 --- a/crypto/provider.c +++ b/crypto/provider.c @@ -13,7 +13,8 @@ #include <openssl/core_names.h> #include "internal/provider.h" -OSSL_PROVIDER *OSSL_PROVIDER_try_load(OSSL_LIB_CTX *libctx, const char *name) +OSSL_PROVIDER *OSSL_PROVIDER_try_load(OSSL_LIB_CTX *libctx, const char *name, + int retain_fallbacks) { OSSL_PROVIDER *prov = NULL; @@ -22,7 +23,7 @@ OSSL_PROVIDER *OSSL_PROVIDER_try_load(OSSL_LIB_CTX *libctx, const char *name) && (prov = ossl_provider_new(libctx, name, NULL, 0)) == NULL) return NULL; - if (!ossl_provider_activate(prov)) { + if (!ossl_provider_activate(prov, retain_fallbacks)) { ossl_provider_free(prov); return NULL; } @@ -34,7 +35,7 @@ OSSL_PROVIDER *OSSL_PROVIDER_load(OSSL_LIB_CTX *libctx, const char *name) { /* Any attempt to load a provider disables auto-loading of defaults */ if (ossl_provider_disable_fallback_loading(libctx)) - return OSSL_PROVIDER_try_load(libctx, name); + return OSSL_PROVIDER_try_load(libctx, name, 0); return NULL; } diff --git a/crypto/provider_conf.c b/crypto/provider_conf.c index 709e7a1c51..cbae99a474 100644 --- a/crypto/provider_conf.c +++ b/crypto/provider_conf.c @@ -130,7 +130,7 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name, ok = provider_conf_params(prov, NULL, value, cnf); if (ok && activate) { - if (!ossl_provider_activate(prov)) { + if (!ossl_provider_activate(prov, 0)) { ok = 0; } else { if (activated_providers == NULL) diff --git a/crypto/provider_core.c b/crypto/provider_core.c index 627ff384e1..da751e60ce 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -667,14 +667,16 @@ static int provider_activate(OSSL_PROVIDER *prov) return 0; } -int ossl_provider_activate(OSSL_PROVIDER *prov) +int ossl_provider_activate(OSSL_PROVIDER *prov, int retain_fallbacks) { if (prov == NULL) return 0; if (provider_activate(prov)) { - CRYPTO_THREAD_write_lock(prov->store->lock); - prov->store->use_fallbacks = 0; - CRYPTO_THREAD_unlock(prov->store->lock); + if (!retain_fallbacks) { + CRYPTO_THREAD_write_lock(prov->store->lock); + prov->store->use_fallbacks = 0; + CRYPTO_THREAD_unlock(prov->store->lock); + } return 1; } return 0; |