[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  da0201814380144151293811e9cd63732e0e0c3e (commit)
      from  fe9edc9d39c96c965efc4fde12ddf7fa8a852025 (commit)


- Log -----------------------------------------------------------------
commit da0201814380144151293811e9cd63732e0e0c3e
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jul 15 11:55:33 2019 +0200

    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 at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/9371)

-----------------------------------------------------------------------

Summary of changes:
 crypto/provider_conf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/provider_conf.c b/crypto/provider_conf.c
index 74162a8..25881d6 100644
--- a/crypto/provider_conf.c
+++ b/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();