From: Matt Caswell <matt@openssl.org>
Date: Thu, 22 Apr 2021 08:43:22 +0000 (+0100)
Subject: Only load the config file into the default libctx if necessary
X-Git-Tag: openssl-3.0.0-alpha17~194
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d07af736de592602f2831f8559d0302cb116e190;p=thirdparty%2Fopenssl.git

Only load the config file into the default libctx if necessary

There is no need to load providers from the config file into the default
libctx, if the current libctx that we are using isn't the default libctx.
This avoids some deadlock situations.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14991)
---

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index c419e6f6442..3d853eb66b1 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -233,7 +233,7 @@ OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name,
          * Make sure any providers are loaded from config before we try to find
          * them.
          */
-        if (!noconfig)
+        if (!noconfig && ossl_lib_ctx_is_default(libctx))
             OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL);
 #endif
 
@@ -842,7 +842,8 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
      * Make sure any providers are loaded from config before we try to use
      * them.
      */
-    OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL);
+    if (ossl_lib_ctx_is_default(ctx))
+        OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL);
 #endif
 
     if (store == NULL)