mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-06 20:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

TEST: Fix CMP tests so they load keys in the current library context

Browse Source 
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/12705)
This commit is contained in:
Richard Levitte 2020-08-23 10:06:06 +02:00
parent 39d9be390a
commit 9afa0748cf
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/cmp_client_test.c
View File

@ -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();

2
test/cmp_msg_test.c
View File

@ -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();

4
test/cmp_protect_test.c
View File

@ -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;

5
test/cmp_testlib.c
View File

@ -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;

2
test/cmp_testlib.h
View File

@ -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);