X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=5054f769f500fa46752a243e607c32715373b29b;hb=99e3a2626b969a15a427a6c0125b37bd5f0db9b1;hp=c32b90f233d205be3811cb1118f6be33222c727b;hpb=fced7943558903bcd081cf8e78ef402862451e29;p=openssl-gost%2Fengine.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c32b90f..5054f76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,69 +183,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}") @@ -275,12 +275,22 @@ 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) +# The GOST engine in module form add_library(gost_engine MODULE ${GOST_ENGINE_SOURCE_FILES}) # Set the suffix explicitly to adapt to OpenSSL's idea of what a # module suffix should be set_target_properties(gost_engine PROPERTIES PREFIX "" OUTPUT_NAME "gost" SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) -target_link_libraries(gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY}) +target_link_libraries(gost_engine PRIVATE gost_core ${OPENSSL_CRYPTO_LIBRARY}) + +# The GOST engine in library form +add_library(lib_gost_engine SHARED ${GOST_ENGINE_SOURCE_FILES}) +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}) + set(GOST_SUM_SOURCE_FILES gostsum.c @@ -302,20 +312,32 @@ 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 -set(OPENSSL_MAN_INSTALL_DIR ${CMAKE_INSTALL_MANDIR}/man1) +# install programs and manuals +install(TARGETS gostsum gost12sum RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(FILES gostsum.1 gost12sum.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) -install(TARGETS gost_engine gostsum gost12sum EXPORT GostEngineConfig +# install engine in library and module form +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 ${CMAKE_INSTALL_BINDIR}) -install(FILES gostsum.1 gost12sum.1 DESTINATION ${OPENSSL_MAN_INSTALL_DIR}) + RUNTIME DESTINATION ${OPENSSL_ENGINES_DIR}) if (MSVC) - install(FILES $ DESTINATION ${OPENSSL_ENGINES_DIR} OPTIONAL) - install(FILES $ $ DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) + 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) endif() +install(EXPORT GostEngineConfig DESTINATION GostEngine/share/cmake/GostEngine)