X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=0add5fdc506eee758dc05c639cbe1ce7c0d2d828;hb=eb01b80247de3fa3848d58d7f2816aff8f396630;hp=76a7d7972cebb4b4c1a68e3c31dc34d049a2c38b;hpb=6547c44e46129c1d9d32760fa37a1a81fa085231;p=openssl-gost%2Fengine.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76a7d79..0add5fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,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
@@ -82,6 +80,7 @@ set(GOST_CORE_SOURCE_FILES
         gost_keywrap.c
         gost_keywrap.h
         gost_lcl.h
+        compat.h
         gost_params.c
         )
 
@@ -117,11 +116,15 @@ target_link_libraries(test_grasshopper gost_engine gost_core ${OPENSSL_CRYPTO_LI
 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)
 
 add_library(gost_engine MODULE ${GOST_ENGINE_SOURCE_FILES})
-set_target_properties(gost_engine PROPERTIES PREFIX "" OUTPUT_NAME "gost")
+set_target_properties(gost_engine PROPERTIES PREFIX "" OUTPUT_NAME "libgost")
 target_link_libraries(gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY})
 
 set(GOST_SUM_SOURCE_FILES