diff options
| -rw-r--r-- | crypto/provider.c | 6 | ||||
| -rw-r--r-- | crypto/provider_conf.c | 15 |
2 files changed, 19 insertions, 2 deletions
diff --git a/crypto/provider.c b/crypto/provider.c index 974c636bc1..114b426929 100644 --- a/crypto/provider.c +++ b/crypto/provider.c @@ -39,6 +39,12 @@ OSSL_PROVIDER *OSSL_PROVIDER_try_load(OSSL_LIB_CTX *libctx, const char *name, ossl_provider_free(prov); return NULL; } + if (actual != prov) { + if (!ossl_provider_activate(actual, 1, 0)) { + ossl_provider_free(actual); + return NULL; + } + } return actual; } diff --git a/crypto/provider_conf.c b/crypto/provider_conf.c index 7acfe49564..c13c887c3d 100644 --- a/crypto/provider_conf.c +++ b/crypto/provider_conf.c @@ -224,11 +224,22 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name, } else if (!ossl_provider_add_to_store(prov, &actual, 0)) { ossl_provider_deactivate(prov, 1); ok = 0; + } else if (actual != prov + && !ossl_provider_activate(actual, 1, 0)) { + ossl_provider_free(actual); + ok = 0; } else { if (pcgbl->activated_providers == NULL) pcgbl->activated_providers = sk_OSSL_PROVIDER_new_null(); - sk_OSSL_PROVIDER_push(pcgbl->activated_providers, actual); - ok = 1; + if (pcgbl->activated_providers == NULL + || !sk_OSSL_PROVIDER_push(pcgbl->activated_providers, + actual)) { + ossl_provider_deactivate(actual, 1); + ossl_provider_free(actual); + ok = 0; + } else { + ok = 1; + } } } if (!ok) |