X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=ff1a71d7acc61c7acb0675c8bb68a9d68a1566d7;hb=a3b21ced5bfe2c42a04cfad7d4f8499f27ec31ca;hp=ee1e080a28fe2c93f571be1b4205ec82d69dd5c7;hpb=f3e84b52d2c5bf6774070b758714b90845d722d2;p=openssl-gost%2Fengine.git diff --git a/CMakeLists.txt b/CMakeLists.txt index ee1e080..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) @@ -9,20 +9,31 @@ include(CheckCSourceRuns) enable_testing() find_package(OpenSSL 3.0 REQUIRED) + +if (NOT DEFINED OPENSSL_ROOT_DIR) + get_filename_component(OPENSSL_ROOT_DIR ${OPENSSL_INCLUDE_DIR} DIRECTORY) + message(STATUS "Setting OpenSSL root: ${OPENSSL_ROOT_DIR}") +endif() find_program(OPENSSL_PROGRAM openssl PATHS ${OPENSSL_ROOT_DIR} PATH_SUFFIXES apps bin NO_DEFAULT_PATH) -message("-- Found OpenSSL application: ${OPENSSL_PROGRAM}") +message(STATUS "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) @@ -131,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 @@ -192,55 +206,55 @@ 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}) -add_test(NAME curves - COMMAND test_curves) +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}) -add_test(NAME keyexpimp - COMMAND test_keyexpimp) +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}) -add_test(NAME gost89 - COMMAND test_gost89) +target_link_libraries(test_gost89 gost_core gost_err) +add_test(NAME gost89 COMMAND test_gost89) if(NOT SKIP_PERL_TESTS) execute_process(COMMAND perl -MTest2::V0 -e "" @@ -255,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 @@ -274,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}) @@ -281,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}) @@ -289,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 @@ -297,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 @@ -321,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})