From da0201814380144151293811e9cd63732e0e0c3e Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 15 Jul 2019 11:55:33 +0200 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/9371) --- 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 74162a88b3..25881d6de8 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(); -- 2.25.1