X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=26161961fb113093f9c2288e1ad44c853d1bcf72;hb=ea08f653579978ba0e39d5a71bce9ed47452f0e3;hp=c95e5ea49cf1593f7388ed8d1fd1337c22557ed8;hpb=dd645e71d12ec790dc6c2e1c44163e2683ae4c6a;p=openssl-gost%2Fengine.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c95e5ea..2616196 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)
@@ -268,6 +271,9 @@ 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)
@@ -400,6 +406,12 @@ install(TARGETS lib_gost_engine EXPORT GostEngineConfig LIBRARY DESTINATION ${CM
 install(TARGETS gost_engine EXPORT GostEngineConfig
         LIBRARY  DESTINATION ${OPENSSL_ENGINES_DIR}
         RUNTIME  DESTINATION ${OPENSSL_ENGINES_DIR})
+# install provider in library and module form
+install(TARGETS lib_gost_prov EXPORT GostProviderConfig
+        LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS gost_prov EXPORT GostProviderConfig
+        LIBRARY  DESTINATION ${OPENSSL_MODULES_DIR}
+        RUNTIME  DESTINATION ${OPENSSL_MODULES_DIR})
 if (MSVC)
   install(FILES $<TARGET_PDB_FILE:lib_gost_engine>
     EXPORT GostEngineConfig DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
@@ -407,5 +419,10 @@ if (MSVC)
     EXPORT GostEngineConfig DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
   install(FILES $<TARGET_PDB_FILE:gost_engine>
     EXPORT GostEngineConfig DESTINATION ${OPENSSL_ENGINES_DIR} OPTIONAL)
+  install(FILES $<TARGET_PDB_FILE:lib_gost_prov>
+    EXPORT GostProviderConfig DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
+  install(FILES $<TARGET_PDB_FILE:gost_prov>
+    EXPORT GostProviderConfig DESTINATION ${OPENSSL_MODULES_DIR} OPTIONAL)
 endif()
 install(EXPORT GostEngineConfig DESTINATION GostEngine/share/cmake/GostEngine)
+install(EXPORT GostProviderConfig DESTINATION GostEngine/share/cmake/GostProvider)