X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=943bb273b76764a8e7246f5d1d4eac90bc8b419e;hb=7e4ba55da1e5a599626b8f7bff9715fe4ec8fd7e;hp=47a3b9527fe4e5c06faaf6f5be25d17c83c71af5;hpb=a4c19712c3b5c525687942aab2e1c5df0d628e35;p=platform%2Fcore%2Fsecurity%2Fkey-manager.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 47a3b95..943bb27 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,9 +2,13 @@ PKG_CHECK_MODULES(KEY_MANAGER_DEP
     dlog
     openssl
     libsmack
+    libcrypto
     libsystemd-daemon
+    capi-base-common
+    db-util
     REQUIRED
     )
+FIND_PACKAGE(Threads REQUIRED)
 
 SET(KEY_MANAGER_SRC_PATH ${PROJECT_SOURCE_DIR}/src)
 SET(KEY_MANAGER_PATH ${PROJECT_SOURCE_DIR}/src/manager)
@@ -14,12 +18,16 @@ SET(KEY_MANAGER_SOURCES
     ${KEY_MANAGER_PATH}/main/generic-socket-manager.cpp
     ${KEY_MANAGER_PATH}/main/socket-manager.cpp
     ${KEY_MANAGER_PATH}/main/key-manager-main.cpp
-    ${KEY_MANAGER_PATH}/service/echo.cpp
     ${KEY_MANAGER_PATH}/service/ckm-service.cpp
     ${KEY_MANAGER_PATH}/service/ckm-logic.cpp
     ${KEY_MANAGER_PATH}/service/key-provider.cpp
     ${KEY_MANAGER_PATH}/service/ocsp.cpp
-    ${KEY_MANAGER_PATH}/service/DBCryptoModule.cpp
+    ${KEY_MANAGER_PATH}/service/crypto-logic.cpp
+    ${KEY_MANAGER_PATH}/service/CryptoService.cpp
+    ${KEY_MANAGER_PATH}/service/file-system.cpp
+    ${KEY_MANAGER_PATH}/service/db-crypto.cpp
+    ${KEY_MANAGER_PATH}/service/ocsp-service.cpp
+    ${KEY_MANAGER_PATH}/service/ocsp-logic.cpp
     )
 
 SET_SOURCE_FILES_PROPERTIES(
@@ -36,40 +44,44 @@ INCLUDE_DIRECTORIES(
     ${KEY_MANAGER_PATH}/main
     ${KEY_MANAGER_PATH}/common
     ${KEY_MANAGER_PATH}/service
+    ${KEY_MANAGER_PATH}/sqlcipher
     ${KEY_MANAGER_PATH}/dpl/core/include
     ${KEY_MANAGER_PATH}/dpl/log/include
+    ${KEY_MANAGER_PATH}/dpl/db/include
     )
 
 ADD_EXECUTABLE(${TARGET_KEY_MANAGER} ${KEY_MANAGER_SOURCES})
 
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER}
+    ${CMAKE_THREAD_LIBS_INIT}
     ${KEY_MANAGER_DEP_LIBRARIES}
     ${TARGET_KEY_MANAGER_COMMON}
-	${TARGET_KEY_MANAGER_KEY_PROVIDER}
     )
 
-
-
 ################################################################################
 
 SET(KEY_MANAGER_CLIENT_VERSION_MAJOR 1)
 SET(KEY_MANAGER_CLIENT_VERSION ${KEY_MANAGER_CLIENT_VERSION_MAJOR}.0.1)
 
 SET(KEY_MANAGER_CLIENT_SRC_PATH ${KEY_MANAGER_PATH}/client)
+SET(KEY_MANAGER_CLIENT_CAPI_SRC_PATH ${KEY_MANAGER_PATH}/client-capi)
 
 INCLUDE_DIRECTORIES(
     ${KEY_MANAGER_PATH}/client
+    ${KEY_MANAGER_PATH}/client-capi
     ${KEY_MANAGER_PATH}/common
     ${KEY_MANAGER_PATH}/dpl/core/include
     ${KEY_MANAGER_PATH}/dpl/log/include
     )
 
 SET(KEY_MANAGER_CLIENT_SOURCES
-    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-control.cpp
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-common.cpp
-    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-echo.cpp
-    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-manager.cpp
+    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-error.cpp
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-manager-impl.cpp
+    ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-type.cpp
+    ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-error.cpp
+    ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-manager.cpp
+    ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-type-converter.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CLIENT} SHARED ${KEY_MANAGER_CLIENT_SOURCES})
@@ -77,7 +89,7 @@ ADD_LIBRARY(${TARGET_KEY_MANAGER_CLIENT} SHARED ${KEY_MANAGER_CLIENT_SOURCES})
 SET_TARGET_PROPERTIES(
     ${TARGET_KEY_MANAGER_CLIENT}
     PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default" 
+        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default"
         SOVERSION ${KEY_MANAGER_CLIENT_VERSION_MAJOR}
         VERSION ${KEY_MANAGER_CLIENT_VERSION}
     )
@@ -89,17 +101,69 @@ TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_CLIENT}
 
 ################################################################################
 
+SET(KEY_MANAGER_CONTROL_CLIENT_VERSION_MAJOR 1)
+SET(KEY_MANAGER_CONTROL_CLIENT_VERSION ${KEY_MANAGER_CONTROL_CLIENT_VERSION_MAJOR}.0.1)
+
+SET(KEY_MANAGER_CONTROL_CLIENT_SRC_PATH ${KEY_MANAGER_PATH}/client)
+SET(KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH ${KEY_MANAGER_PATH}/client-capi)
+
+INCLUDE_DIRECTORIES(
+    ${KEY_MANAGER_PATH}/client
+    ${KEY_MANAGER_PATH}/client-capi
+    ${KEY_MANAGER_PATH}/common
+    ${KEY_MANAGER_PATH}/dpl/core/include
+    ${KEY_MANAGER_PATH}/dpl/log/include
+    )
+
+SET(KEY_MANAGER_CONTROL_CLIENT_SOURCES
+    ${KEY_MANAGER_CONTROL_CLIENT_SRC_PATH}/client-control.cpp
+    ${KEY_MANAGER_CONTROL_CLIENT_SRC_PATH}/client-common.cpp
+    ${KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH}/ckmc-control.cpp
+    ${KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH}/ckmc-type-converter.cpp
+    )
+
+ADD_LIBRARY(${TARGET_KEY_MANAGER_CONTROL_CLIENT} SHARED ${KEY_MANAGER_CONTROL_CLIENT_SOURCES})
+
+SET_TARGET_PROPERTIES(
+    ${TARGET_KEY_MANAGER_CONTROL_CLIENT}
+    PROPERTIES
+        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default"
+        SOVERSION ${KEY_MANAGER_CONTROL_CLIENT_VERSION_MAJOR}
+        VERSION ${KEY_MANAGER_CONTROL_CLIENT_VERSION}
+    )
+
+TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_CONTROL_CLIENT}
+    ${KEY_MANAGER_DEP_LIBRARIES}
+    ${TARGET_KEY_MANAGER_COMMON}
+    )
+
+################################################################################
 INSTALL(TARGETS ${TARGET_KEY_MANAGER_CLIENT} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${TARGET_KEY_MANAGER_CONTROL_CLIENT} DESTINATION ${LIB_INSTALL_DIR})
 
 INSTALL(TARGETS ${TARGET_KEY_MANAGER} DESTINATION bin)
 
+
 INSTALL(FILES
-    ${KEY_MANAGER_SRC_PATH}/include/ckm/key-manager.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-manager.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-certificate.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-control.h
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-error.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-key.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-password.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-pkcs12.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-raw-buffer.h
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-type.h
     DESTINATION /usr/include/ckm/ckm
     )
-
+INSTALL(FILES
+    ${KEY_MANAGER_SRC_PATH}/include/ckmc/ckmc-manager.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckmc/ckmc-control.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckmc/ckmc-error.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckmc/ckmc-type.h
+    DESTINATION /usr/include/ckm/ckmc
+    )
 ################################################################################
 
 ADD_SUBDIRECTORY(manager)
+ADD_SUBDIRECTORY(listener)