diff options
| author | Neil Horman <nhorman@openssl.org> | 2024-04-05 09:06:10 -0400 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-04-18 18:38:56 +0200 |
| commit | 4e3c1e6206251c59855362d6d2edab4621c31dec (patch) | |
| tree | d18bc3156dbad11348b4d1c354f3ef1eebed1974 | |
| parent | b80fed3f27ebe156b17246f7c12c5178cbe6834e (diff) | |
Fix up path generation to use OPENSSL_MODULES
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)
| -rw-r--r-- | crypto/provider_core.c | 9 | ||||
| -rw-r--r-- | test/prov_config_test.c | 15 |
2 files changed, 19 insertions, 5 deletions
diff --git a/crypto/provider_core.c b/crypto/provider_core.c index 4bbb928006..297b281a39 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -573,10 +573,6 @@ 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); @@ -584,6 +580,11 @@ OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name, if (prov == NULL) return NULL; + if (!ossl_provider_set_module_path(prov, template.path)) { + ossl_provider_free(prov); + return NULL; + } + prov->libctx = libctx; #ifndef FIPS_MODULE prov->error_lib = ERR_get_next_error_library(); diff --git a/test/prov_config_test.c b/test/prov_config_test.c index 2fac741a3d..fee2dffdb2 100644 --- a/test/prov_config_test.c +++ b/test/prov_config_test.c @@ -72,14 +72,27 @@ static int test_recursive_config(void) return testresult; } +#define P_TEST_PATH "/../test/p_test.so" static int test_path_config(void) { OSSL_LIB_CTX *ctx = NULL; OSSL_PROVIDER *prov; int testresult = 0; struct stat sbuf; + char *module_path = getenv("OPENSSL_MODULES"); + char *full_path = NULL; + int rc; - if (stat("../test/p_test.so", &sbuf) == -1) + full_path = OPENSSL_zalloc(strlen(module_path) + strlen(P_TEST_PATH) + 1); + if (!TEST_ptr(full_path)) + return 0; + + strcpy(full_path, module_path); + full_path = strcat(full_path, P_TEST_PATH); + TEST_info("full path is %s", full_path); + rc = stat(full_path, &sbuf); + OPENSSL_free(full_path); + if (rc == -1) return TEST_skip("Skipping modulepath test as provider not present"); if (!TEST_ptr(pathedconfig)) |