X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=21946dd48e1fae7e19ac084817785ded8bdcddba;hb=d6606535ac51bb3e574312106088f3f15843536e;hp=a784d15b712ac446f9c67e52de13523d33ad976c;hpb=1a9452e997f5b5ef75e201357b5c57bd2f940081;p=platform%2Fcore%2Fsecurity%2Fkey-manager.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a784d15..21946dd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,26 +1,3 @@
-IF (DEFINED WATCHDOG_ENABLED)
-SET(EXTRA_KM_DEPS argos_watchdog)
-ELSE (DEFINED WATCHDOG_ENABLED)
-SET(EXTRA_KM_DEPS)
-ENDIF (DEFINED WATCHDOG_ENABLED)
-
-PKG_CHECK_MODULES(KEY_MANAGER_DEP
-    REQUIRED
-    dlog
-    glib-2.0
-    openssl
-    libsmack
-    libcrypto
-    libsystemd-daemon
-    capi-base-common
-    capi-system-info
-    libxml-2.0
-    security-manager
-    cynara-client-async
-    cynara-creds-socket
-    pkgmgr
-    ${EXTRA_KM_DEPS}
-    )
 FIND_PACKAGE(Threads REQUIRED)
 
 SET(KEY_MANAGER_SRC_PATH ${PROJECT_SOURCE_DIR}/src)
@@ -54,6 +31,7 @@ SET(KEY_MANAGER_SOURCES
     ${KEY_MANAGER_PATH}/service/ocsp-service.cpp
     ${KEY_MANAGER_PATH}/service/ss-migrate.cpp
     ${KEY_MANAGER_PATH}/service/ss-crypto.cpp
+    ${KEY_MANAGER_PATH}/service/permission.cpp
     ${KEY_MANAGER_PATH}/initial-values/parser.cpp
     ${KEY_MANAGER_PATH}/initial-values/BufferHandler.cpp
     ${KEY_MANAGER_PATH}/initial-values/CertHandler.cpp
@@ -63,28 +41,25 @@ SET(KEY_MANAGER_SOURCES
     ${KEY_MANAGER_PATH}/initial-values/InitialValueHandler.cpp
     ${KEY_MANAGER_PATH}/initial-values/InitialValuesFile.cpp
     ${KEY_MANAGER_PATH}/initial-values/NoCharactersHandler.cpp
-    ${KEY_MANAGER_PATH}/initial-values/SWKeyFile.cpp
     ${KEY_MANAGER_PATH}/initial-values/xml-utils.cpp
     ${KEY_MANAGER_PATH}/initial-values/initial-value-loader.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/obj.cpp
     ${KEY_MANAGER_PATH}/crypto/sw-backend/internals.cpp
     ${KEY_MANAGER_PATH}/crypto/sw-backend/store.cpp
+    ${KEY_MANAGER_PATH}/crypto/sw-backend/kbkdf.cpp
     ${KEY_MANAGER_PATH}/crypto/platform/decider.cpp
-    ${KEY_MANAGER_PATH}/crypto/tz-backend/obj.cpp
-    ${KEY_MANAGER_PATH}/crypto/tz-backend/store.cpp
     ${SECURITY_MANAGER_WRAPPER_PATH}
     ${CYNARA_WRAPPER_PATH}
+    ${TZ_BACKEND_SOURCES}
+    ${SE_BACKEND_SOURCES}
     )
 
-# -fPIE and -pie flag is added for ASLR
 SET_SOURCE_FILES_PROPERTIES(
     ${KEY_MANAGER_SOURCES}
     PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -fPIE")
+        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden")
 
 INCLUDE_DIRECTORIES(SYSTEM
     ${KEY_MANAGER_DEP_INCLUDE_DIRS}
@@ -92,11 +67,11 @@ INCLUDE_DIRECTORIES(SYSTEM
 
 INCLUDE_DIRECTORIES(
     ${KEY_MANAGER_SRC_PATH}/include
+    ${PROJECT_SOURCE_DIR}/common
     ${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
@@ -107,14 +82,13 @@ LINK_DIRECTORIES(${KEY_MANAGER_DEP_LIBRARY_DIRS})
 
 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}
-    -ldl -pie
+    ${KM_LINK_EXTRA_DEPS}
+    -ldl
     )
-
 ################################################################################
 
 SET(KEY_MANAGER_CLIENT_VERSION_MAJOR 1)
@@ -156,7 +130,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=hidden -Wno-deprecated-declarations"
+        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -Wno-deprecated-declarations"
         SOVERSION ${KEY_MANAGER_CLIENT_VERSION_MAJOR}
         VERSION ${KEY_MANAGER_CLIENT_VERSION}
     )
@@ -194,7 +168,7 @@ 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=hidden  -Wno-deprecated-declarations"
+        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -Wno-deprecated-declarations"
         SOVERSION ${KEY_MANAGER_CONTROL_CLIENT_VERSION_MAJOR}
         VERSION ${KEY_MANAGER_CONTROL_CLIENT_VERSION}
     )
@@ -222,6 +196,7 @@ INSTALL(FILES
     ${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
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-zero-memory.h
     DESTINATION /usr/include/ckm/ckm
     )
 INSTALL(FILES
@@ -233,5 +208,10 @@ INSTALL(FILES
     )
 ################################################################################
 
+CONFIGURE_FILE(
+    ${PROJECT_SOURCE_DIR}/packaging/key-manager.manifest.in
+    ${PROJECT_SOURCE_DIR}/key-manager.manifest @ONLY
+)
+
 ADD_SUBDIRECTORY(manager)
 ADD_SUBDIRECTORY(pam_plugin)