Browse Source

Provider config module: allow providers to already be loaded

This allows 'default' to be configured in the config file, if needed.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9371)
Richard Levitte 4 years ago
parent
commit
da02018143
1 changed files with 3 additions and 1 deletions
  1. 3 1
      crypto/provider_conf.c

+ 3 - 1
crypto/provider_conf.c

@@ -113,7 +113,9 @@ static int provider_conf_load(OPENSSL_CTX *libctx, const char *name,
             activate = 1;
     }
 
-    prov = ossl_provider_new(libctx, name, NULL);
+    prov = ossl_provider_find(libctx, name);
+    if (prov == NULL)
+        prov = ossl_provider_new(libctx, name, NULL);
     if (prov == NULL) {
         if (soft)
             ERR_clear_error();