X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=cee45356fbaa35570543e8dfb868fd1c66d6c4f2;hb=2ffd7dabe3d9f191c8933d89dcc62db1bee75200;hp=e38b49607211c3b5c26d731ba6b2317f8769efc2;hpb=41b4121253a9c0e8d82d3eebcfe728d5d43e1b51;p=openssl-gost%2Fengine.git diff --git a/CMakeLists.txt b/CMakeLists.txt index e38b496..cee4535 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ include(CheckCSourceRuns) enable_testing() -find_package(OpenSSL 1.1.1 REQUIRED) +find_package(OpenSSL 3.0 REQUIRED) include_directories(${OPENSSL_INCLUDE_DIR}) if (CMAKE_C_COMPILER_ID MATCHES "Clang") @@ -168,6 +168,11 @@ target_link_libraries(test_digest gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY add_test(NAME digest COMMAND test_digest) +add_executable(test_ciphers test_ciphers.c) +target_link_libraries(test_ciphers gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY}) +add_test(NAME ciphers + COMMAND test_ciphers) + add_executable(test_curves test_curves.c) target_link_libraries(test_curves gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY}) add_test(NAME curves @@ -193,11 +198,6 @@ target_link_libraries(test_context gost_engine gost_core ${OPENSSL_CRYPTO_LIBRAR add_test(NAME context COMMAND test_context) -add_executable(test_grasshopper test_grasshopper.c) -target_link_libraries(test_grasshopper gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY}) -add_test(NAME grasshopper - COMMAND test_grasshopper) - add_executable(test_keyexpimp test_keyexpimp.c) #target_compile_definitions(test_keyexpimp PUBLIC -DOPENSSL_LOAD_CONF) target_link_libraries(test_keyexpimp gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY}) @@ -229,11 +229,11 @@ target_link_libraries(sign gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY} ${CLO # All that may need to load just built engine will have path to it defined. set(BINARY_TESTS_TARGETS test_digest + test_ciphers test_curves test_params test_sign test_context - test_grasshopper test_keyexpimp test_gost89 test_tls