X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=ff1a71d7acc61c7acb0675c8bb68a9d68a1566d7;hb=a3b21ced5bfe2c42a04cfad7d4f8499f27ec31ca;hp=d705b3b51d5106ceddcc859a75352de15759bd1d;hpb=59235edfa31f794c0c16e2484d7da108d60b772c;p=openssl-gost%2Fengine.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d705b3b..ff1a71d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18 FATAL_ERROR) project(gost-engine LANGUAGES C) include(GNUInstallDirs) @@ -142,9 +142,12 @@ set(GOST_GRASSHOPPER_SOURCE_FILES gost_grasshopper_cipher.c ) -set(GOST_CORE_SOURCE_FILES +set(GOST_ERR_SOURCE_FILES e_gost_err.c e_gost_err.h + ) + +set(GOST_CORE_SOURCE_FILES gost_ameth.c gost_pmeth.c gost_ctl.c @@ -203,54 +206,54 @@ set(TEST_ENVIRONMENT OPENSSL_CONF=${CMAKE_CURRENT_SOURCE_DIR}/test/engine.cnf ) add_executable(test_digest test_digest.c) -target_link_libraries(test_digest ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(test_digest OpenSSL::Crypto) 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 ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(test_ciphers OpenSSL::Crypto) 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}) +target_link_libraries(test_curves gost_core gost_err) add_test(NAME curves COMMAND test_curves) add_executable(test_params test_params.c) -target_link_libraries(test_params ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(test_params OpenSSL::Crypto) 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 ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(test_derive OpenSSL::Crypto) 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 ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(test_sign OpenSSL::Crypto) 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 ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY}) +target_link_libraries(test_tls OpenSSL::SSL) 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 ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(test_context OpenSSL::Crypto) 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}) +target_link_libraries(test_keyexpimp gost_core gost_err) 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}) +target_link_libraries(test_gost89 gost_core gost_err) add_test(NAME gost89 COMMAND test_gost89) if(NOT SKIP_PERL_TESTS) @@ -266,7 +269,7 @@ if(NOT SKIP_PERL_TESTS) endif() add_executable(sign benchmark/sign.c) -target_link_libraries(sign gost_core ${OPENSSL_CRYPTO_LIBRARY} ${CLOCK_GETTIME_LIB}) +target_link_libraries(sign gost_core gost_err ${CLOCK_GETTIME_LIB}) # All that may need to load just built engine will have path to it defined. set(BINARY_TESTS_TARGETS @@ -285,6 +288,10 @@ set_property(TARGET ${BINARY_TESTS_TARGETS} APPEND PROPERTY COMPILE_DEFINITIONS add_library(gost_core STATIC ${GOST_LIB_SOURCE_FILES}) set_target_properties(gost_core PROPERTIES POSITION_INDEPENDENT_CODE ON) +target_link_libraries(gost_core PRIVATE OpenSSL::Crypto) +add_library(gost_err STATIC ${GOST_ERR_SOURCE_FILES}) +set_target_properties(gost_err PROPERTIES POSITION_INDEPENDENT_CODE ON) +target_link_libraries(gost_err PRIVATE OpenSSL::Crypto) # The GOST engine in module form add_library(gost_engine MODULE ${GOST_ENGINE_SOURCE_FILES}) @@ -292,7 +299,7 @@ add_library(gost_engine MODULE ${GOST_ENGINE_SOURCE_FILES}) # module suffix should be set_target_properties(gost_engine PROPERTIES PREFIX "" OUTPUT_NAME "gost" SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) -target_link_libraries(gost_engine PRIVATE gost_core ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(gost_engine PRIVATE gost_core gost_err) # The GOST engine in library form add_library(lib_gost_engine SHARED ${GOST_ENGINE_SOURCE_FILES}) @@ -300,7 +307,7 @@ set_target_properties(lib_gost_engine PROPERTIES COMPILE_DEFINITIONS "BUILDING_ENGINE_AS_LIBRARY" PUBLIC_HEADER gost-engine.h OUTPUT_NAME "gost") -target_link_libraries(lib_gost_engine PRIVATE gost_core ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(lib_gost_engine PRIVATE gost_core) set(GOST_SUM_SOURCE_FILES @@ -308,14 +315,14 @@ set(GOST_SUM_SOURCE_FILES ) add_executable(gostsum ${GOST_SUM_SOURCE_FILES}) -target_link_libraries(gostsum gost_core ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(gostsum gost_core gost_err) set(GOST_12_SUM_SOURCE_FILES gost12sum.c ) add_executable(gost12sum ${GOST_12_SUM_SOURCE_FILES}) -target_link_libraries(gost12sum gost_core) +target_link_libraries(gost12sum gost_core gost_err) set_source_files_properties(tags PROPERTIES GENERATED true) add_custom_target(tags @@ -332,7 +339,7 @@ add_custom_target(tcl_tests WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tcl_tests) add_executable(test_tlstree test_tlstree.c) -target_link_libraries(test_tlstree PUBLIC ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(test_tlstree PUBLIC OpenSSL::Crypto) # install programs and manuals install(TARGETS gostsum gost12sum RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})