From: Neil Horman <nhorman@openssl.org>
Date: Tue, 2 Apr 2024 19:02:51 +0000 (-0400)
Subject: set module path from template
X-Git-Tag: openssl-3.4.0-alpha1~675
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc9595963a45e28e6a8b2de45a6719c252bd3a3d;p=thirdparty%2Fopenssl.git

set module path from template

Modules that aren't activated at conf load time don't seem to set the
module path from the template leading to load failures.  Make sure to
set that

Fixes #24020

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24025)
---

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index b0cb039705c..4bbb928006b 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -573,6 +573,10 @@ OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
 
     /* provider_new() generates an error, so no need here */
     prov = provider_new(name, template.init, template.parameters);
+    if (!ossl_provider_set_module_path(prov, template.path)) {
+        ossl_provider_free(prov);
+        return NULL;
+    }
 
     if (params != NULL) /* We copied the parameters, let's free them */
         sk_INFOPAIR_pop_free(template.parameters, infopair_free);