From: Dmitry Belyavskiy Date: Fri, 28 May 2021 11:02:16 +0000 (+0300) Subject: Merge branch 'master' into update-codeql-analysis X-Git-Tag: v3.0.0~18^2^2 X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=a42d467935d3ce859e288f3934df2e25073f9ba9;hp=996d2c5fc61d549fac323f50a4c02798d479876f;p=openssl-gost%2Fengine.git Merge branch 'master' into update-codeql-analysis --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fb7b6e..a6bb178 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,14 +15,20 @@ message("-- Found OpenSSL application: ${OPENSSL_PROGRAM}") include_directories(${OPENSSL_INCLUDE_DIR}) if (CMAKE_C_COMPILER_ID MATCHES "Clang") - add_compile_options(-O2 -Werror -Wall -Wno-unused-parameter -Wno-unused-function -Wno-missing-braces -ggdb -Qunused-arguments -Wno-deprecated-declarations) + set(CMAKE_C_FLAGS_RELEASE -O2) + set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -ggdb") + add_compile_options(-Werror -Wall -Wno-unused-parameter -Wno-unused-function -Wno-missing-braces -Qunused-arguments -Wno-deprecated-declarations) elseif(CMAKE_C_COMPILER_ID MATCHES "GNU") - add_compile_options(-O2 -Werror -Wall -Wno-unused-parameter -Wno-unused-function -Wno-missing-braces -ggdb -Wno-error=unknown-pragmas -Wno-error=pragmas -Wno-deprecated-declarations) + set(CMAKE_C_FLAGS_RELEASE -O2) + set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -ggdb") + add_compile_options(-Werror -Wall -Wno-unused-parameter -Wno-unused-function -Wno-missing-braces -Wno-error=unknown-pragmas -Wno-error=pragmas -Wno-deprecated-declarations) elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS) - add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) - add_compile_options(/MP /WX /W4 /wd4100 /wd4267 /wd4206 /wd4706 /wd4244 /wd4115) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS) + add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) + add_compile_options(/MP /WX /W4 /wd4100 /wd4267 /wd4206 /wd4706 /wd4244 /wd4115) endif() if (ASAN) @@ -183,69 +189,69 @@ set(GOST_ENGINE_SOURCE_FILES gost_eng.c ) +set(TEST_ENVIRONMENT + CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} + PERL5LIB=${CMAKE_CURRENT_SOURCE_DIR}/test + OPENSSL_ENGINES=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + OPENSSL_PROGRAM=${OPENSSL_PROGRAM} + OPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY} + OPENSSL_CONF=${CMAKE_CURRENT_SOURCE_DIR}/test/engine.cnf + ) add_executable(test_digest test_digest.c) -target_link_libraries(test_digest gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME digest - COMMAND test_digest) +target_link_libraries(test_digest ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME digest COMMAND test_digest) +set_tests_properties(digest PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_ciphers test_ciphers.c) -target_link_libraries(test_ciphers gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME ciphers - COMMAND test_ciphers) +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 gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME parameters - COMMAND test_params) +target_link_libraries(test_params ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME parameters COMMAND test_params) +set_tests_properties(parameters PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_derive test_derive.c) -target_link_libraries(test_derive gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME derive - COMMAND test_derive) +target_link_libraries(test_derive ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME derive COMMAND test_derive) +set_tests_properties(derive PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_sign test_sign.c) -target_link_libraries(test_sign gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME sign/verify - COMMAND test_sign) +target_link_libraries(test_sign ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME sign/verify COMMAND test_sign) +set_tests_properties(sign/verify PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_tls test_tls.c) -target_link_libraries(test_tls gost_core ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY}) -add_test(NAME TLS - COMMAND test_tls) +target_link_libraries(test_tls ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY}) +add_test(NAME TLS COMMAND test_tls) +set_tests_properties(TLS PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") add_executable(test_context test_context.c) -target_link_libraries(test_context gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME context - COMMAND test_context) +target_link_libraries(test_context ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME context COMMAND test_context) +set_tests_properties(context PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") +# test_keyexpimp is an internals testing program, it doesn't need a test env add_executable(test_keyexpimp test_keyexpimp.c) #target_compile_definitions(test_keyexpimp PUBLIC -DOPENSSL_LOAD_CONF) target_link_libraries(test_keyexpimp gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME keyexpimp - COMMAND test_keyexpimp) +add_test(NAME keyexpimp COMMAND test_keyexpimp) +# test_gost89 is an internals testing program, it doesn't need a test env add_executable(test_gost89 test_gost89.c) target_link_libraries(test_gost89 gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME gost89 - COMMAND test_gost89) +add_test(NAME gost89 COMMAND test_gost89) if(NOT SKIP_PERL_TESTS) execute_process(COMMAND perl -MTest2::V0 -e "" ERROR_QUIET RESULT_VARIABLE HAVE_TEST2_V0) if(NOT HAVE_TEST2_V0) - set(TEST_ENVIRONMENT - CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} - PERL5LIB=${CMAKE_CURRENT_SOURCE_DIR}/test - OPENSSL_ENGINES=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - OPENSSL_PROGRAM=${OPENSSL_PROGRAM} - OPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY} - OPENSSL_CONF=${CMAKE_CURRENT_SOURCE_DIR}/test/empty.cnf - ) add_test(NAME engine COMMAND prove --merge -PWrapOpenSSL ${CMAKE_CURRENT_SOURCE_DIR}/test) set_tests_properties(engine PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT}") @@ -312,18 +318,23 @@ add_custom_target(tags WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) add_custom_target(tcl_tests - COMMAND ENGINE_DIR=${OUTPUT_DIRECTORY} sh ./runtest.sh + COMMAND OPENSSL_LIBCRYPTO=${OPENSSL_CRYPTO_LIBRARY} + OPENSSL_APP=${OPENSSL_PROGRAM} + TESTSRC=${CMAKE_SOURCE_DIR}/tcl_tests + TESTDIR=${CMAKE_BINARY_DIR}/tcl_tests + ENGINE_DIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + sh ./runtest.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tcl_tests) add_executable(test_tlstree test_tlstree.c) target_link_libraries(test_tlstree PUBLIC ${OPENSSL_CRYPTO_LIBRARY}) # install programs and manuals -install(TARGETS gostsum gost12sum) -install(FILES gostsum.1 gost12sum.1 DESTINATION ${CMAKE_INSTALL_DIR}/man1) +install(TARGETS gostsum gost12sum RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(FILES gostsum.1 gost12sum.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) # install engine in library and module form -install(TARGETS lib_gost_engine EXPORT GostEngineConfig) +install(TARGETS lib_gost_engine EXPORT GostEngineConfig LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS gost_engine EXPORT GostEngineConfig LIBRARY DESTINATION ${OPENSSL_ENGINES_DIR} RUNTIME DESTINATION ${OPENSSL_ENGINES_DIR}) diff --git a/gost_ec_keyx.c b/gost_ec_keyx.c index eeb0122..40cad2b 100644 --- a/gost_ec_keyx.c +++ b/gost_ec_keyx.c @@ -672,6 +672,13 @@ static int pkey_gost2018_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key, o q * Q_eph is not equal to zero point. */ + if (eph_key == NULL || priv == NULL || data == NULL) { + GOSTerr(GOST_F_PKEY_GOST2018_DECRYPT, + GOST_R_ERROR_COMPUTING_EXPORT_KEYS); + ret = 0; + goto err; + } + if (data->shared_ukm_size == 0 && pst->ukm != NULL) { if (EVP_PKEY_CTX_ctrl(pctx, -1, -1, EVP_PKEY_CTRL_SET_IV, ASN1_STRING_length(pst->ukm), (void *)ASN1_STRING_get0_data(pst->ukm)) < 0) { diff --git a/tcl_tests/dgst.try b/tcl_tests/dgst.try index 21c2ca7..77d6365 100644 --- a/tcl_tests/dgst.try +++ b/tcl_tests/dgst.try @@ -25,7 +25,7 @@ test -createsfiles {dgst.dat dgst0.dat dgst2.dat dgst8.dat dgst63.dat dgst_CF.da makeFile dgst.dat [string repeat "Test data to digest.\n" 100] binary makeFile dgst0.dat "" binary makeFile dgst63.dat "012345678901234567890123456789012345678901234567890123456789012" binary - file copy -force ../dgst_CF.dat ../dgst_ex1.dat ../dgst_ex2.dat . + file copy -force $::test::src/dgst_CF.dat $::test::src/dgst_ex1.dat $::test::src/dgst_ex2.dat . } 0 "" test "Вычисление дайджеста алгоритмом md_gost12_256" { diff --git a/tcl_tests/enc.try b/tcl_tests/enc.try index ffe9baf..054ca8c 100644 --- a/tcl_tests/enc.try +++ b/tcl_tests/enc.try @@ -2,13 +2,13 @@ lappend auto_path [file dirname [info script]] package require ossltest set plain0 [getFile plain.enc] -file copy -force cfb0.enc $::test::dir -file copy -force cnt0.enc $::test::dir -file copy -force cbc0.enc $::test::dir -file copy -force aes0.enc $::test::dir -file copy -force plain.enc $::test::dir -file copy -force magma_plain.enc $::test::dir -file copy -force magma_acpkm_plain.enc $::test::dir +file copy -force $::test::src/cfb0.enc $::test::dir +file copy -force $::test::src/cnt0.enc $::test::dir +file copy -force $::test::src/cbc0.enc $::test::dir +file copy -force $::test::src/aes0.enc $::test::dir +file copy -force $::test::src/plain.enc $::test::dir +file copy -force $::test::src/magma_plain.enc $::test::dir +file copy -force $::test::src/magma_acpkm_plain.enc $::test::dir set cfb1 [getFile cfb1.enc] set cbc1 [getFile cbc1.enc] set cnt1 [getFile cnt1.enc] diff --git a/tcl_tests/mac.try b/tcl_tests/mac.try index 908d75b..8305f5d 100644 --- a/tcl_tests/mac.try +++ b/tcl_tests/mac.try @@ -10,7 +10,7 @@ test -createsfiles {dgst.dat dgst0.dat dgst2.dat dgst8.dat dgst63.dat mac-grassh makeFile dgst2.dat [string repeat "1\n" 1] binary makeFile dgst8.dat [string repeat "1\n" 4] binary makeFile dgst63.dat "012345678901234567890123456789012345678901234567890123456789012" binary - file copy -force ../mac-grasshopper.dat ../mac-magma.dat . + file copy -force $::test::src/mac-grasshopper.dat $::test::src/mac-magma.dat . } 0 "" test "Вычисление HMAC(md_gost12_512)" { diff --git a/tcl_tests/ossltest.tcl b/tcl_tests/ossltest.tcl index a6f0283..792c071 100644 --- a/tcl_tests/ossltest.tcl +++ b/tcl_tests/ossltest.tcl @@ -61,6 +61,16 @@ package require test set test::suffix "" package require base64 +# +# set up test::src variable +# + +if {[info exists env(TESTSRC)]} { + set ::test::src [file normalize $env(TESTSRC)] +} else { + set ::test::src [pwd] +} + # # set up test::dir variable # diff --git a/tcl_tests/runtest.sh b/tcl_tests/runtest.sh index 9ad744b..9969102 100644 --- a/tcl_tests/runtest.sh +++ b/tcl_tests/runtest.sh @@ -23,6 +23,15 @@ CRYPTOPACK_MAIN_VERSION=3 +if [ -n "$OPENSSL_LIBCRYPTO" ]; then + libdir=`dirname $OPENSSL_LIBCRYPTO` + # Linux, ELF HP-UX + LD_LIBRARY_PATH=${libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + export LD_LIBRARY_PATH + # MacOS X + DYLD_LIBRARY_PATH=${libdir}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}} + export DYLD_LIBRARY_PATH +fi : ${OPENSSL_APP:=$(which openssl 2>/dev/null)} if [ -z "$OPENSSL_APP" ]; then if [ "$OS" != "Windows NT" -a "$OS" != "Windows_NT" ]; then @@ -79,10 +88,11 @@ APP_SUFFIX=`basename $OPENSSL_APP .exe|sed s/openssl//` [ -n "$OPENSSL_APP" ]&& export OPENSSL_APP ENGINE_NAME=`$TCLSH getengine.tcl` export ENGINE_NAME -TESTDIR=`hostname`-$ENGINE_NAME +[ -z "$TESTDIR" ] && TESTDIR=`pwd` +TESTDIR=${TESTDIR}/`hostname`-$ENGINE_NAME [ -n "$APP_SUFFIX" ] && TESTDIR=${TESTDIR}-${APP_SUFFIX} [ -d ${TESTDIR} ] && rm -rf ${TESTDIR} -mkdir ${TESTDIR} +mkdir -p ${TESTDIR} cp oidfile ${TESTDIR} export TESTDIR diff --git a/test/engine.cnf b/test/engine.cnf new file mode 100644 index 0000000..c75b518 --- /dev/null +++ b/test/engine.cnf @@ -0,0 +1,7 @@ +openssl_conf = openssl_def +[openssl_def] +engines = engines +[engines] +gost = gost_conf +[gost_conf] +default_algorithms = ALL diff --git a/test_ciphers.c b/test_ciphers.c index 77810e7..a88c281 100644 --- a/test_ciphers.c +++ b/test_ciphers.c @@ -463,13 +463,7 @@ int main(int argc, char **argv) /* Trigger SIGBUS for unaligned access. */ sysmips(MIPS_FIXADE, 0); #endif - 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)); for (t = testcases; t->nid; t++) { int inplace; @@ -489,7 +483,9 @@ int main(int argc, char **argv) t->iv, t->iv_size, t->acpkm); } + ENGINE *eng; ENGINE_CIPHERS_PTR fn_c; + T(eng = ENGINE_by_id("gost")); T(fn_c = ENGINE_get_ciphers(eng)); const int *nids; int n, k; @@ -501,8 +497,6 @@ int main(int argc, char **argv) if (!t->nid) printf(cMAGENT "Cipher %s is untested!" cNORM "\n", OBJ_nid2sn(nids[k])); } - - ENGINE_finish(eng); ENGINE_free(eng); if (ret) diff --git a/test_context.c b/test_context.c index 0db2163..1e284c0 100644 --- a/test_context.c +++ b/test_context.c @@ -245,13 +245,7 @@ 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)); const struct testcase_cipher *tc; for (tc = testcases_ciphers; tc->nid; tc++) { @@ -263,9 +257,6 @@ int main(int argc, char **argv) ret |= test_contexts_digest(td->nid, td->mac); } - ENGINE_finish(eng); - ENGINE_free(eng); - if (ret) printf(cDRED "= Some tests FAILED!" cNORM "\n"); else 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 diff --git a/test_derive.c b/test_derive.c index c93549c..c99ccef 100644 --- a/test_derive.c +++ b/test_derive.c @@ -364,13 +364,7 @@ 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)); int i; for (i = 0; i < OSSL_NELEM(derive_tests); i++) @@ -389,9 +383,6 @@ int main(int argc, char **argv) ret |= test_derive_alg("gost2012_512", "C", i); } - ENGINE_finish(eng); - ENGINE_free(eng); - if (ret) printf(cDRED "= Some tests FAILED!" cNORM "\n"); else diff --git a/test_digest.c b/test_digest.c index bebbf7a..8500233 100644 --- a/test_digest.c +++ b/test_digest.c @@ -821,13 +821,7 @@ int main(int argc, char **argv) /* Trigger SIGBUS for unaligned access. */ sysmips(MIPS_FIXADE, 0); #endif - 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)); const struct hash_testvec *tv; for (tv = testvecs; tv->nid; tv++) { @@ -837,7 +831,9 @@ int main(int argc, char **argv) ret |= do_synthetic_test(tv); } + ENGINE *eng; ENGINE_DIGESTS_PTR fn_c; + T(eng = ENGINE_by_id("gost")); T(fn_c = ENGINE_get_digests(eng)); const int *nids; int n, k; @@ -849,8 +845,6 @@ int main(int argc, char **argv) if (!tv->nid) printf(cMAGENT "Digest %s is untested!" cNORM "\n", OBJ_nid2sn(nids[k])); } - - ENGINE_finish(eng); ENGINE_free(eng); if (ret) diff --git a/test_params.c b/test_params.c index 4e6317e..89bae3d 100644 --- a/test_params.c +++ b/test_params.c @@ -1160,13 +1160,7 @@ 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_param **tpp; for (tpp = test_params; *tpp; tpp++) @@ -1176,9 +1170,6 @@ int main(int argc, char **argv) for (tc = test_certs; tc->cert; tc++) ret |= test_cert(tc); - ENGINE_finish(eng); - ENGINE_free(eng); - if (ret) printf(cDRED "= Some tests FAILED!" cNORM "\n"); else diff --git a/test_sign.c b/test_sign.c index 983b63e..0322ac0 100644 --- a/test_sign.c +++ b/test_sign.c @@ -7,7 +7,6 @@ * See https://www.openssl.org/source/license.html for details */ -#include "e_gost_err.h" #include "gost_lcl.h" #include #include @@ -17,6 +16,7 @@ #include #include #include +#include #include #include @@ -177,7 +177,7 @@ static int test_sign(struct test_sign *t) fflush(stdout); pkey = NULL; OSSL_STORE_CTX *cts; - T(cts = OSSL_STORE_attach(bp, "file", NULL, NULL, NULL, NULL, NULL, NULL)); + T(cts = OSSL_STORE_attach(bp, "file", NULL, NULL, NULL, NULL, NULL, NULL, NULL)); for (;;) { OSSL_STORE_INFO *info = OSSL_STORE_load(cts); if (!info) { @@ -318,21 +318,12 @@ 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_sign *sp; for (sp = test_signs; sp->name; sp++) ret |= test_sign(sp); - ENGINE_finish(eng); - ENGINE_free(eng); - if (ret) printf(cDRED "= Some tests FAILED!" cNORM "\n"); else diff --git a/test_tls.c b/test_tls.c index 216fb2a..a6ac41e 100644 --- a/test_tls.c +++ b/test_tls.c @@ -355,13 +355,7 @@ 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)); char *p; if ((p = getenv("VERBOSE"))) @@ -377,9 +371,6 @@ int main(int argc, char **argv) ret |= test("gost2012_512", "B"); ret |= test("gost2012_512", "C"); - ENGINE_finish(eng); - ENGINE_free(eng); - if (ret) printf(cDRED "= Some tests FAILED!\n" cNORM); else