root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Neil Horman 2024-04-05 09:06:10 -04:00 committed by Tomas Mraz
parent b80fed3f27
commit 4e3c1e6206
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/provider_core.c
View File

@ -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 */ /* provider_new() generates an error, so no need here */
prov = provider_new(name, template.init, template.parameters); 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 */ if (params != NULL) /* We copied the parameters, let's free them */
sk_INFOPAIR_pop_free(template.parameters, infopair_free); 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) if (prov == NULL)
return NULL; return NULL;
if (!ossl_provider_set_module_path(prov, template.path)) {
ossl_provider_free(prov);
return NULL;
}
prov->libctx = libctx; prov->libctx = libctx;
#ifndef FIPS_MODULE #ifndef FIPS_MODULE
prov->error_lib = ERR_get_next_error_library(); prov->error_lib = ERR_get_next_error_library();

15
test/prov_config_test.c
View File

@ -72,14 +72,27 @@ static int test_recursive_config(void)
return testresult; return testresult;
} }
#define P_TEST_PATH "/../test/p_test.so"
static int test_path_config(void) static int test_path_config(void)
{ {
OSSL_LIB_CTX *ctx = NULL; OSSL_LIB_CTX *ctx = NULL;
OSSL_PROVIDER *prov; OSSL_PROVIDER *prov;
int testresult = 0; int testresult = 0;
struct stat sbuf; 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"); return TEST_skip("Skipping modulepath test as provider not present");
if (!TEST_ptr(pathedconfig)) if (!TEST_ptr(pathedconfig))