diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c index 9fb3050ac0..111a4c27f4 100644 --- a/test/cmp_client_test.c +++ b/test/cmp_client_test.c @@ -372,9 +372,9 @@ int setup_tests(void) if (!test_get_libctx(&libctx, &default_null_provider, &provider, 5, USAGE)) return 0; - if (!TEST_ptr(server_key = load_pem_key(server_key_f)) + if (!TEST_ptr(server_key = load_pem_key(server_key_f, libctx)) || !TEST_ptr(server_cert = load_pem_cert(server_cert_f, libctx)) - || !TEST_ptr(client_key = load_pem_key(client_key_f)) + || !TEST_ptr(client_key = load_pem_key(client_key_f, libctx)) || !TEST_ptr(client_cert = load_pem_cert(client_cert_f, libctx)) || !TEST_int_eq(1, RAND_bytes_ex(libctx, ref, sizeof(ref)))) { cleanup_tests(); diff --git a/test/cmp_msg_test.c b/test/cmp_msg_test.c index b9309a6983..a56f04f1df 100644 --- a/test/cmp_msg_test.c +++ b/test/cmp_msg_test.c @@ -575,7 +575,7 @@ int setup_tests(void) if (!test_get_libctx(&libctx, &default_null_provider, &provider, 3, USAGE)) return 0; - if (!TEST_ptr(newkey = load_pem_key(newkey_f)) + if (!TEST_ptr(newkey = load_pem_key(newkey_f, libctx)) || !TEST_ptr(cert = load_pem_cert(server_cert_f, libctx)) || !TEST_int_eq(1, RAND_bytes_ex(libctx, ref, sizeof(ref)))) { cleanup_tests(); diff --git a/test/cmp_protect_test.c b/test/cmp_protect_test.c index 6413c20a23..66cc6af370 100644 --- a/test/cmp_protect_test.c +++ b/test/cmp_protect_test.c @@ -521,11 +521,11 @@ int setup_tests(void) if (!test_get_libctx(&libctx, &default_null_provider, &provider, 10, USAGE)) return 0; - if (!TEST_ptr(loadedkey = load_pem_key(server_key_f)) + if (!TEST_ptr(loadedkey = load_pem_key(server_key_f, libctx)) || !TEST_ptr(cert = load_pem_cert(server_cert_f, libctx))) return 0; - if (!TEST_ptr(loadedprivkey = load_pem_key(server_f))) + if (!TEST_ptr(loadedprivkey = load_pem_key(server_f, libctx))) return 0; if (TEST_true(EVP_PKEY_up_ref(loadedprivkey))) loadedpubkey = loadedprivkey; diff --git a/test/cmp_testlib.c b/test/cmp_testlib.c index ffa43cd81c..754a6ba845 100644 --- a/test/cmp_testlib.c +++ b/test/cmp_testlib.c @@ -14,7 +14,7 @@ DEFINE_STACK_OF(X509) -EVP_PKEY *load_pem_key(const char *file) +EVP_PKEY *load_pem_key(const char *file, OPENSSL_CTX *libctx) { EVP_PKEY *key = NULL; BIO *bio = NULL; @@ -22,7 +22,8 @@ EVP_PKEY *load_pem_key(const char *file) if (!TEST_ptr(bio = BIO_new(BIO_s_file()))) return NULL; if (TEST_int_gt(BIO_read_filename(bio, file), 0)) - (void)TEST_ptr(key = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL)); + (void)TEST_ptr(key = PEM_read_bio_PrivateKey_ex(bio, NULL, NULL, NULL, + libctx, NULL)); BIO_free(bio); return key; diff --git a/test/cmp_testlib.h b/test/cmp_testlib.h index e24074cdd7..e8ae7a1834 100644 --- a/test/cmp_testlib.h +++ b/test/cmp_testlib.h @@ -23,7 +23,7 @@ # ifndef OPENSSL_NO_CMP # define CMP_TEST_REFVALUE_LENGTH 15 /* arbitrary value */ -EVP_PKEY *load_pem_key(const char *file); +EVP_PKEY *load_pem_key(const char *file, OPENSSL_CTX *libctx); X509 *load_pem_cert(const char *file, OPENSSL_CTX *libctx); X509_REQ *load_csr(const char *file); OSSL_CMP_MSG *load_pkimsg(const char *file);