diff options
| author | Matt Caswell <matt@openssl.org> | 2021-06-21 12:08:39 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-06-24 14:48:14 +0100 |
| commit | 814c2018e11c99aeb3d84e0fee2b3943ff4039c8 (patch) | |
| tree | f8be7de986e700d45148f88e5085d41e8e1fd145 /crypto/provider_conf.c | |
| parent | eb2263da9abf3676cbcac672eee8a26416a8c309 (diff) | |
Merge ossl_provider_activate() and ossl_provider_activate_child()
These 2 functions have become so close to each other that they may as well
be just one function.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/provider_conf.c b/crypto/provider_conf.c index 1e59e959e3..398340c3d2 100644 --- a/crypto/provider_conf.c +++ b/crypto/provider_conf.c @@ -171,7 +171,7 @@ 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, 1)) { + if (!ossl_provider_activate(prov, 1, 0)) { ok = 0; } else if (!ossl_provider_add_to_store(prov, 0)) { ossl_provider_deactivate(prov); |