浏览代码

Build libbcrypt as static library

Jonas Pflanzer 4 年之前
父节点
当前提交
a025b95f48
共有 3 个文件被更改,包括 16 次插入2 次删除
  1. 2 0
      daemon/CMakeLists.txt
  2. 2 2
      daemon/src/CMakeLists.txt
  3. 12 0
      libs/libbcrypt/CMakeLists.txt

+ 2 - 0
daemon/CMakeLists.txt

@@ -11,6 +11,8 @@ find_package(Threads REQUIRED)
 find_package(Boost 1.70 REQUIRED COMPONENTS system filesystem)
 find_package(Jsoncpp REQUIRED)
 
+add_subdirectory(../libs/libbcrypt/ ${CMAKE_BINARY_DIR}/libbcrypt)
+
 include(src/CMakeLists.txt)
 
 if(ENABLE_TESTS)

+ 2 - 2
daemon/src/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-add_executable(ccats src/main.cpp src/Server.cpp src/base64.cpp src/JsonCommander.cpp src/FileManager.cpp src/UserManager.cpp src/Config.cpp src/CovertChannel/CovertChannel.cpp src/CovertChannel/ForwardChannel.cpp src/Notifications.cpp src/Queue.cpp ../libs/libbcrypt/bcrypt.c ../libs/libbcrypt/crypt_blowfish/crypt_blowfish.c ../libs/libbcrypt/crypt_blowfish/crypt_gensalt.c ../libs/libbcrypt/crypt_blowfish/wrapper.c)
+add_executable(ccats src/main.cpp src/Server.cpp src/base64.cpp src/JsonCommander.cpp src/FileManager.cpp src/UserManager.cpp src/Config.cpp src/CovertChannel/CovertChannel.cpp src/CovertChannel/ForwardChannel.cpp src/Notifications.cpp src/Queue.cpp)
 
 # dependencies used by server only
 find_package(libtins 4.2 REQUIRED)
 find_package(OpenSSL REQUIRED)
 
 include_directories(${Boost_INCLUDE_DIR} ${JSONCPP_INCLUDE_DIRS})
-target_link_libraries(ccats PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES} ${LIBTINS_LIBRARIES} ${JSONCPP_LIBRARIES})
+target_link_libraries(ccats PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES} ${LIBTINS_LIBRARIES} ${JSONCPP_LIBRARIES} libbcrypt.a)

+ 12 - 0
libs/libbcrypt/CMakeLists.txt

@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 2.8)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(libbcrypt.a
+            STATIC
+            bcrypt.c
+            crypt_blowfish/crypt_blowfish.c
+            crypt_blowfish/crypt_gensalt.c
+            crypt_blowfish/wrapper.c
+)