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/provider_conf.c | |
| 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/provider_conf.c')
| -rw-r--r-- | crypto/provider_conf.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |