X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=b24586022ea0f1fdd3aedf8a76c9056788ef526c;hb=9467b36084c3664e19622a4177ec2b69a08cbeba;hp=6d54883f50806347661853af7e020ea0668aa322;hpb=674262a797f44839237be5b8b4b0e8a9e25867c4;p=platform%2Fcore%2Fsecurity%2Fkey-manager.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6d54883..b245860 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,35 +5,60 @@ PKG_CHECK_MODULES(KEY_MANAGER_DEP
     libcrypto
     libsystemd-daemon
     capi-base-common
-    db-util
+    vconf
+    libxml-2.0
     REQUIRED
     )
+FIND_PACKAGE(Threads REQUIRED)
 
 SET(KEY_MANAGER_SRC_PATH ${PROJECT_SOURCE_DIR}/src)
 SET(KEY_MANAGER_PATH ${PROJECT_SOURCE_DIR}/src/manager)
 
 SET(KEY_MANAGER_SOURCES
-    ${KEY_MANAGER_PATH}/main/key-manager-util.cpp
     ${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}/main/smack-check.cpp
+    ${KEY_MANAGER_PATH}/main/thread-service.cpp
+    ${KEY_MANAGER_PATH}/service/certificate-store.cpp
+    ${KEY_MANAGER_PATH}/service/certificate-config.cpp
+    ${KEY_MANAGER_PATH}/service/digest.cpp
+    ${KEY_MANAGER_PATH}/service/file-lock.cpp
+    ${KEY_MANAGER_PATH}/service/access-control.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/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
+    ${KEY_MANAGER_PATH}/initial-values/parser.cpp
+    ${KEY_MANAGER_PATH}/initial-values/BufferHandler.cpp
+    ${KEY_MANAGER_PATH}/initial-values/CertHandler.cpp
+    ${KEY_MANAGER_PATH}/initial-values/DataHandler.cpp
+    ${KEY_MANAGER_PATH}/initial-values/KeyHandler.cpp
+    ${KEY_MANAGER_PATH}/initial-values/PermissionHandler.cpp
+    ${KEY_MANAGER_PATH}/initial-values/InitialValueHandler.cpp
+    ${KEY_MANAGER_PATH}/initial-values/InitialValuesFile.cpp
+    ${KEY_MANAGER_PATH}/initial-values/xml-utils.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/assert.cpp
+    ${KEY_MANAGER_PATH}/dpl/db/src/sql_connection.cpp
+    ${KEY_MANAGER_PATH}/dpl/db/src/naive_synchronization_object.cpp
+    ${KEY_MANAGER_PATH}/sqlcipher/sqlcipher.c
+    ${KEY_MANAGER_PATH}/crypto/sw-backend/key.cpp
+    ${KEY_MANAGER_PATH}/crypto/sw-backend/internals.cpp
+    ${KEY_MANAGER_PATH}/crypto/sw-backend/store.cpp
+    ${KEY_MANAGER_PATH}/crypto/sw-backend/crypto-service.cpp
+    ${KEY_MANAGER_PATH}/crypto/platform/decider.cpp
     )
 
+# -fPIE and -pie flag is added for ASLR
 SET_SOURCE_FILES_PROPERTIES(
     ${KEY_MANAGER_SOURCES}
     PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden")
+        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -fPIE")
 
 INCLUDE_DIRECTORIES(SYSTEM
     ${KEY_MANAGER_DEP_INCLUDE_DIRS}
@@ -44,18 +69,22 @@ INCLUDE_DIRECTORIES(
     ${KEY_MANAGER_PATH}/main
     ${KEY_MANAGER_PATH}/common
     ${KEY_MANAGER_PATH}/service
+    ${KEY_MANAGER_PATH}/initial-values
     ${KEY_MANAGER_PATH}/sqlcipher
     ${KEY_MANAGER_PATH}/dpl/core/include
     ${KEY_MANAGER_PATH}/dpl/log/include
     ${KEY_MANAGER_PATH}/dpl/db/include
+    ${KEY_MANAGER_PATH}/crypto
     )
 
 ADD_EXECUTABLE(${TARGET_KEY_MANAGER} ${KEY_MANAGER_SOURCES})
 
+# pie flag is added for ASLR
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER}
+    ${CMAKE_THREAD_LIBS_INIT}
     ${KEY_MANAGER_DEP_LIBRARIES}
     ${TARGET_KEY_MANAGER_COMMON}
-    ${TARGET_KEY_MANAGER_KEY_PROVIDER}
+    -ldl -pie
     )
 
 ################################################################################
@@ -64,10 +93,12 @@ 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_ASYNC_SRC_PATH ${KEY_MANAGER_PATH}/client-async)
 SET(KEY_MANAGER_CLIENT_CAPI_SRC_PATH ${KEY_MANAGER_PATH}/client-capi)
 
 INCLUDE_DIRECTORIES(
     ${KEY_MANAGER_PATH}/client
+    ${KEY_MANAGER_PATH}/client-async
     ${KEY_MANAGER_PATH}/client-capi
     ${KEY_MANAGER_PATH}/common
     ${KEY_MANAGER_PATH}/dpl/core/include
@@ -76,34 +107,20 @@ INCLUDE_DIRECTORIES(
 
 SET(KEY_MANAGER_CLIENT_SOURCES
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-common.cpp
-    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-echo.cpp
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-error.cpp
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-manager-impl.cpp
+    ${KEY_MANAGER_CLIENT_ASYNC_SRC_PATH}/client-manager-async.cpp
+    ${KEY_MANAGER_CLIENT_ASYNC_SRC_PATH}/client-manager-async-impl.cpp
+    ${KEY_MANAGER_CLIENT_ASYNC_SRC_PATH}/connection-thread.cpp
+    ${KEY_MANAGER_CLIENT_ASYNC_SRC_PATH}/async-request.cpp
+    ${KEY_MANAGER_CLIENT_ASYNC_SRC_PATH}/service.cpp
+    ${KEY_MANAGER_CLIENT_ASYNC_SRC_PATH}/storage-receiver.cpp
+    ${KEY_MANAGER_CLIENT_ASYNC_SRC_PATH}/ocsp-receiver.cpp
+    ${KEY_MANAGER_CLIENT_ASYNC_SRC_PATH}/descriptor-set.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
-    ${KEY_MANAGER_PATH}/common/base64.cpp
-    ${KEY_MANAGER_PATH}/common/digest.cpp
-    ${KEY_MANAGER_PATH}/common/protocols.cpp
-    ${KEY_MANAGER_PATH}/common/message-buffer.cpp
-    ${KEY_MANAGER_PATH}/common/smack-check.cpp
-    ${KEY_MANAGER_PATH}/common/certificate-impl.cpp
-    ${KEY_MANAGER_PATH}/common/certificate-store.cpp
-    ${KEY_MANAGER_PATH}/common/generic-key.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/abstract_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/dlog_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/log.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/old_style_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/assert.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/binary_queue.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/colors.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/exception.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/noncopyable.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/serialization.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/singleton.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/string.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/errno_string.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CLIENT} SHARED ${KEY_MANAGER_CLIENT_SOURCES})
@@ -111,13 +128,14 @@ 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=hidden"
         SOVERSION ${KEY_MANAGER_CLIENT_VERSION_MAJOR}
         VERSION ${KEY_MANAGER_CLIENT_VERSION}
     )
 
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_CLIENT}
     ${KEY_MANAGER_DEP_LIBRARIES}
+    ${TARGET_KEY_MANAGER_COMMON}
     )
 
 ################################################################################
@@ -141,27 +159,6 @@ SET(KEY_MANAGER_CONTROL_CLIENT_SOURCES
     ${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
-    ${KEY_MANAGER_PATH}/common/base64.cpp
-    ${KEY_MANAGER_PATH}/common/digest.cpp
-    ${KEY_MANAGER_PATH}/common/protocols.cpp
-    ${KEY_MANAGER_PATH}/common/message-buffer.cpp
-    ${KEY_MANAGER_PATH}/common/smack-check.cpp
-    ${KEY_MANAGER_PATH}/common/certificate-impl.cpp
-    ${KEY_MANAGER_PATH}/common/certificate-store.cpp
-    ${KEY_MANAGER_PATH}/common/generic-key.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/abstract_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/dlog_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/log.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/old_style_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/assert.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/binary_queue.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/colors.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/exception.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/noncopyable.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/serialization.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/singleton.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/string.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/errno_string.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CONTROL_CLIENT} SHARED ${KEY_MANAGER_CONTROL_CLIENT_SOURCES})
@@ -169,13 +166,14 @@ ADD_LIBRARY(${TARGET_KEY_MANAGER_CONTROL_CLIENT} SHARED ${KEY_MANAGER_CONTROL_CL
 SET_TARGET_PROPERTIES(
     ${TARGET_KEY_MANAGER_CONTROL_CLIENT}
     PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default"
+        COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=hidden"
         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}
     )
 
 ################################################################################
@@ -187,12 +185,13 @@ INSTALL(TARGETS ${TARGET_KEY_MANAGER} DESTINATION bin)
 
 INSTALL(FILES
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-manager.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-manager-async.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-echo.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
@@ -207,3 +206,5 @@ INSTALL(FILES
 ################################################################################
 
 ADD_SUBDIRECTORY(manager)
+ADD_SUBDIRECTORY(listener)
+ADD_SUBDIRECTORY(pam_plugin)