summaryrefslogtreecommitdiffstats
path: root/test/acvp_test.c
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-09-26 15:21:48 +0200
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-12-10 11:01:26 +0100
commitbca7ad6efd0e1e828033cae2440d83322bf3dc01 (patch)
tree57d6dc04ab9481e63ca61e2b5174ce1cc641018f /test/acvp_test.c
parentRead MIDR_EL1 system register on aarch64 (diff)
downloadopenssl-bca7ad6efd0e1e828033cae2440d83322bf3dc01.tar.xz
openssl-bca7ad6efd0e1e828033cae2440d83322bf3dc01.zip
Use adapted test_get_libctx() for simpler test setup and better error reporting
Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/13001)
Diffstat (limited to 'test/acvp_test.c')
-rw-r--r--test/acvp_test.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/test/acvp_test.c b/test/acvp_test.c
index 1686d759db..5c4a38749f 100644
--- a/test/acvp_test.c
+++ b/test/acvp_test.c
@@ -1434,18 +1434,9 @@ int setup_tests(void)
}
}
- prov_null = OSSL_PROVIDER_load(NULL, "null");
- if (prov_null == NULL) {
- opt_printf_stderr("Failed to load null provider into default libctx\n");
+ if (!test_get_libctx(&libctx, &prov_null, config_file, NULL, NULL))
return 0;
- }
- libctx = OSSL_LIB_CTX_new();
- if (libctx == NULL
- || !OSSL_LIB_CTX_load_config(libctx, config_file)) {
- opt_printf_stderr("Failed to load config\n");
- return 0;
- }
OSSL_SELF_TEST_set_callback(libctx, self_test_events, &self_test_args);
ADD_ALL_TESTS(cipher_enc_dec_test, OSSL_NELEM(cipher_enc_data));