From 3881226ccc975666346f88d00c1f1917e9ccfd91 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 1 May 2021 08:41:42 +0200 Subject: [PATCH] Don't load the gost engine in test_curves.c This test is so internal that it doesn't even need the engine. --- CMakeLists.txt | 4 ++-- test_curves.c | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee1e080..6ba5a97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -201,10 +201,10 @@ target_link_libraries(test_ciphers ${OPENSSL_CRYPTO_LIBRARY}) add_test(NAME ciphers COMMAND test_ciphers) set_tests_properties(ciphers PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") +# test_curves is an internals testing program, it doesn't need a test env add_executable(test_curves test_curves.c) target_link_libraries(test_curves gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME curves - COMMAND test_curves) +add_test(NAME curves COMMAND test_curves) add_executable(test_params test_params.c) target_link_libraries(test_params ${OPENSSL_CRYPTO_LIBRARY}) diff --git a/test_curves.c b/test_curves.c index 0b8b8f6..73c47d9 100644 --- a/test_curves.c +++ b/test_curves.c @@ -5,7 +5,6 @@ * See https://www.openssl.org/source/license.html for details */ -#include "e_gost_err.h" #include "gost_lcl.h" #include #include @@ -225,22 +224,11 @@ int main(int argc, char **argv) { int ret = 0; - setenv("OPENSSL_ENGINES", ENGINE_DIR, 0); - OPENSSL_add_all_algorithms_conf(); - ERR_load_crypto_strings(); - ENGINE *eng; - T(eng = ENGINE_by_id("gost")); - T(ENGINE_init(eng)); - T(ENGINE_set_default(eng, ENGINE_METHOD_ALL)); - struct test_curve *tc; for (tc = test_curves; tc->nid; tc++) { ret |= parameter_test(tc); } - ENGINE_finish(eng); - ENGINE_free(eng); - if (ret) printf(cDRED "= Some tests FAILED!" cNORM "\n"); else -- 2.39.2