Merge pull request #75 from IamUndef/patch-1

[openssl-gost/engine.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d834144a7f069ec7f32cdfaac0e9d224ffdeaf1..9cd784d0dfb46b7322d60b161ed894d55b060599 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,9 @@ project(gost-engine LANGUAGES C)
 
 include(GNUInstallDirs)
 
-find_package(OpenSSL 1.0.2 REQUIRED)
+enable_testing()
+
+find_package(OpenSSL 1.1.1 REQUIRED)
 include_directories(${OPENSSL_INCLUDE_DIR})
 
 if (CMAKE_C_COMPILER_ID MATCHES "Clang")
@@ -66,8 +68,6 @@ set(GOST_GRASSHOPPER_SOURCE_FILES
         gost_grasshopper_precompiled.c
         gost_grasshopper_cipher.h
         gost_grasshopper_cipher.c
-        gost_grasshopper_mac.h
-        gost_grasshopper_mac.c
         )
 
 set(GOST_CORE_SOURCE_FILES
@@ -90,6 +90,7 @@ set(GOST_EC_SOURCE_FILES
 
 set (GOST_OMAC_SOURCE_FILES
         gost_omac.c
+        gost_omac_acpkm.c
         )
 
 set(GOST_LIB_SOURCE_FILES
@@ -108,8 +109,18 @@ set(GOST_ENGINE_SOURCE_FILES
         gost_md2012.c
         gost_pmeth.c
         gost_omac.c
+        gost_omac_acpkm.c
         )
 
+add_executable(test_grasshopper test_grasshopper.c)
+target_link_libraries(test_grasshopper gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY})
+add_test(NAME grasshopper
+       COMMAND test_grasshopper)
+
+add_test(NAME engine
+        COMMAND perl run_tests
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test)
+
 add_library(gost_core STATIC ${GOST_LIB_SOURCE_FILES})
 set_target_properties(gost_core PROPERTIES POSITION_INDEPENDENT_CODE ON)