X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=0a53cba68293c2096ee0b29d98998d6523d9850f;hb=7255dcf52d88fb99468023466b0554d76a48f862;hp=c95e5ea49cf1593f7388ed8d1fd1337c22557ed8;hpb=dd645e71d12ec790dc6c2e1c44163e2683ae4c6a;p=openssl-gost%2Fengine.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c95e5ea..0a53cba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,7 @@ find_program(OPENSSL_PROGRAM openssl PATHS ${OPENSSL_ROOT_DIR} PATH_SUFFIXES apps bin NO_DEFAULT_PATH) message(STATUS "Found OpenSSL application: ${OPENSSL_PROGRAM}") include_directories(${OPENSSL_INCLUDE_DIR}) +set(OPENSSL_MODULES_DIR ${CMAKE_INSTALL_LIBDIR}/ossl-modules) if (CMAKE_C_COMPILER_ID MATCHES "Clang") set(CMAKE_C_FLAGS_RELEASE -O2) @@ -33,7 +34,7 @@ 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_compile_options(/MP /WX /W4 /wd4100 /wd4267 /wd4206 /wd4706 /wd4244 /wd4115 /wd4996) endif() if (ASAN) @@ -42,11 +43,6 @@ if (ASAN) set(SKIP_PERL_TESTS 1) endif() -# DEPRECATEDIN_3_0 CMAC -set_source_files_properties(gost_omac.c PROPERTIES COMPILE_FLAGS -Wno-error=deprecated-declarations) -# DEPRECATEDIN_3_0 HMAC -set_source_files_properties(gost_keyexpimp.c PROPERTIES COMPILE_FLAGS -Wno-error=deprecated-declarations) - set(CMAKE_C_STANDARD 90) CHECK_FUNCTION_EXISTS(clock_gettime HAVE_CLOCK_GETTIME_C) CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_CLOCK_GETTIME_RT) @@ -201,6 +197,7 @@ set(GOST_PROV_SOURCE_FILES gost_prov.c gost_prov_cipher.c gost_prov_digest.c + gost_prov_mac.c ) set(TEST_ENVIRONMENT_COMMON @@ -227,12 +224,18 @@ target_link_libraries(test_digest OpenSSL::Crypto) add_test(NAME digest-with-engine COMMAND test_digest) set_tests_properties(digest-with-engine PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}") +add_test(NAME digest-with-provider COMMAND test_digest) +set_tests_properties(digest-with-provider + PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_PROVIDER}") add_executable(test_ciphers test_ciphers.c) target_link_libraries(test_ciphers OpenSSL::Crypto) add_test(NAME ciphers-with-engine COMMAND test_ciphers) set_tests_properties(ciphers-with-engine PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}") +add_test(NAME ciphers-with-provider COMMAND test_ciphers) +set_tests_properties(ciphers-with-provider + PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_PROVIDER}") # test_curves is an internals testing program, it doesn't need a test env add_executable(test_curves test_curves.c) @@ -257,17 +260,22 @@ add_test(NAME sign/verify-with-engine COMMAND test_sign) set_tests_properties(sign/verify-with-engine PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}") -add_executable(test_tls test_tls.c) -target_link_libraries(test_tls OpenSSL::SSL) -add_test(NAME TLS-with-engine COMMAND test_tls) -set_tests_properties(TLS-with-engine - PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}") +if(NOT MSVC) + add_executable(test_tls test_tls.c) + target_link_libraries(test_tls OpenSSL::SSL) + add_test(NAME TLS-with-engine COMMAND test_tls) + set_tests_properties(TLS-with-engine + PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}") +endif() add_executable(test_context test_context.c) target_link_libraries(test_context OpenSSL::Crypto) add_test(NAME context-with-engine COMMAND test_context) set_tests_properties(context-with-engine PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}") +add_test(NAME context-with-provider COMMAND test_context) +set_tests_properties(context-with-provider + PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_PROVIDER}") # test_keyexpimp is an internals testing program, it doesn't need a test env add_executable(test_keyexpimp test_keyexpimp.c) @@ -282,8 +290,9 @@ 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) + ERROR_QUIET RESULT_VARIABLE MISSING_TEST2_V0) + find_program(HAVE_PROVE NAMES prove) + if(NOT MISSING_TEST2_V0 AND HAVE_PROVE) add_test(NAME engine COMMAND prove --merge -PWrapOpenSSL ${CMAKE_CURRENT_SOURCE_DIR}/test :: engine) set_tests_properties(engine PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}") @@ -295,8 +304,10 @@ if(NOT SKIP_PERL_TESTS) endif() endif() -add_executable(sign benchmark/sign.c) -target_link_libraries(sign gost_core gost_err ${CLOCK_GETTIME_LIB}) +if(NOT MSVC) + add_executable(sign benchmark/sign.c) + target_link_libraries(sign gost_core gost_err ${CLOCK_GETTIME_LIB}) +endif() # All that may need to load just built engine will have path to it defined. set(BINARY_TESTS_TARGETS @@ -309,8 +320,10 @@ set(BINARY_TESTS_TARGETS test_context test_keyexpimp test_gost89 - test_tls ) +if(NOT MSVC) + list(APPEND BINARY_TESTS_TARGETS test_tls) +endif() set_property(TARGET ${BINARY_TESTS_TARGETS} APPEND PROPERTY COMPILE_DEFINITIONS ENGINE_DIR="${OUTPUT_DIRECTORY}") add_library(gost_core STATIC ${GOST_LIB_SOURCE_FILES}) @@ -328,6 +341,7 @@ set_target_properties(gost_engine PROPERTIES PREFIX "" OUTPUT_NAME "gost" SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) target_link_libraries(gost_engine PRIVATE gost_core gost_err) +if (NOT MSVC) # The GOST engine in library form add_library(lib_gost_engine SHARED ${GOST_ENGINE_SOURCE_FILES}) set_target_properties(lib_gost_engine PROPERTIES @@ -335,7 +349,7 @@ set_target_properties(lib_gost_engine PROPERTIES PUBLIC_HEADER gost-engine.h OUTPUT_NAME "gost") target_link_libraries(lib_gost_engine PRIVATE gost_core gost_err) - +endif() # The GOST provider uses this add_subdirectory(libprov) @@ -350,6 +364,7 @@ set_target_properties(gost_prov PROPERTIES ) target_link_libraries(gost_prov PRIVATE gost_core libprov) +if (NOT MSVC) # The GOST provider in library form add_library(lib_gost_prov SHARED ${GOST_PROV_SOURCE_FILES} ${GOST_ENGINE_SOURCE_FILES} @@ -359,6 +374,7 @@ set_target_properties(lib_gost_prov PROPERTIES COMPILE_DEFINITIONS "BUILDING_GOST_PROVIDER;BUILDING_PROVIDER_AS_LIBRARY;OPENSSL_NO_DYNAMIC_ENGINE" ) target_link_libraries(lib_gost_prov PRIVATE gost_core libprov) +endif() set(GOST_SUM_SOURCE_FILES gostsum.c @@ -395,17 +411,28 @@ target_link_libraries(test_tlstree PUBLIC OpenSSL::Crypto) 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 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +# install engine and provider in module form install(TARGETS gost_engine EXPORT GostEngineConfig LIBRARY DESTINATION ${OPENSSL_ENGINES_DIR} RUNTIME DESTINATION ${OPENSSL_ENGINES_DIR}) +install(TARGETS gost_prov EXPORT GostProviderConfig + LIBRARY DESTINATION ${OPENSSL_MODULES_DIR} + RUNTIME DESTINATION ${OPENSSL_MODULES_DIR}) +if (NOT MSVC) +# install engine and provider in library form +install(TARGETS lib_gost_engine EXPORT GostEngineConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(TARGETS lib_gost_prov EXPORT GostProviderConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +endif() + if (MSVC) - install(FILES $ - EXPORT GostEngineConfig DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) install(FILES $ $ EXPORT GostEngineConfig DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) install(FILES $ EXPORT GostEngineConfig DESTINATION ${OPENSSL_ENGINES_DIR} OPTIONAL) + install(FILES $ + EXPORT GostProviderConfig DESTINATION ${OPENSSL_MODULES_DIR} OPTIONAL) endif() install(EXPORT GostEngineConfig DESTINATION GostEngine/share/cmake/GostEngine) +install(EXPORT GostProviderConfig DESTINATION GostEngine/share/cmake/GostProvider)