Vconf key used only when sec_product_feature_mdfpp_state_enable 1

Change-Id: I447c3fdbd6617537a7767afa015b0f3065aac6ac
Signed-off-by: kyungwook tak <k.tak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70971d7..45962b9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,13 @@ IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
     ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")
 ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
+IF (DEFINED SECURITY_MDFPP_STATE_ENABLE)
+    MESSAGE("SECURITY_MDFPP_STATE_ENABLE ENABLED !")
+    ADD_DEFINITIONS("-DSECURITY_MDFPP_STATE_ENABLE")
+ELSE (DEFINED SECURITY_MDFPP_STATE_ENABLE)
+    MESSAGE("SECURITY_MDFPP_STATE_ENABLE DISABLED !")
+ENDIF (DEFINED SECURITY_MDFPP_STATE_ENABLE)
+
 SET(TARGET_KEY_MANAGER "key-manager")
 SET(TARGET_KEY_MANAGER_CLIENT "key-manager-client")
 SET(TARGET_KEY_MANAGER_CONTROL_CLIENT "key-manager-control-client")

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 17c257c..9059bdb 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -100,6 +100,9 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir} "
 %cmake . -DVERSION=%{version} \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
+%if "%{sec_product_feature_security_mdfpp_enable}" == "1"
+        -DSECURITY_MDFPP_STATE_ENABLE=1 \
+%endif
         -DSYSTEMD_UNIT_DIR=%{_unitdir}
 make %{?jobs:-j%jobs}
 

diff --git a/src/listener/listener-daemon.cpp b/src/listener/listener-daemon.cpp
index d776238..0568c77 100644 (file)
--- a/src/listener/listener-daemon.cpp
+++ b/src/listener/listener-daemon.cpp
@@ -27,12 +27,15 @@
 #include <package_manager.h>
 #include <ckm/ckm-control.h>
 #include <ckm/ckm-type.h>
-#include <vconf/vconf.h>
 #include <dlog.h>
 
+#ifdef SECURITY_MDFPP_STATE_ENABLE
+#include <vconf/vconf.h>
+#endif
+
 #define CKM_LISTENER_TAG "CKM_LISTENER"
 
-#ifndef VCONFKEY_SECURITY_MDPP_STATE
+#if defined(SECURITY_MDFPP_STATE_ENABLE) && !defined(VCONFKEY_SECURITY_MDPP_STATE)
 #define VCONFKEY_SECURITY_MDPP_STATE "file/security_mdpp/security_mdpp_state"
 #endif
 
@@ -53,6 +56,7 @@ bool isCkmRunning()
     return (0 != ret);
 }
 
+#ifdef SECURITY_MDFPP_STATE_ENABLE
 void callUpdateCCMode()
 {
     if(!isCkmRunning())
@@ -69,6 +73,13 @@ void callUpdateCCMode()
         SLOG(LOG_DEBUG, CKM_LISTENER_TAG, "CKM::Control::updateCCMode success.\n");
 }
 
+void ccModeChangedEventCallback(keynode_t*, void*)
+{
+    callUpdateCCMode();
+}
+#endif
+
+
 void packageUninstalledEventCallback(
     const char *type,
     const char *package,
@@ -102,11 +113,6 @@ void packageUninstalledEventCallback(
     }
 }
 
-void ccModeChangedEventCallback(keynode_t*, void*)
-{
-    callUpdateCCMode();
-}
-
 int main(void) {
     SLOG(LOG_DEBUG, CKM_LISTENER_TAG, "%s", "Start!");
 
@@ -123,6 +129,7 @@ int main(void) {
     }
     SLOG(LOG_DEBUG, CKM_LISTENER_TAG, "register uninstalledApp event callback success");
 
+#ifdef SECURITY_MDFPP_STATE_ENABLE
     int ret = 0;
     char *mdpp_state = vconf_get_str(VCONFKEY_SECURITY_MDPP_STATE);
     if ( mdpp_state ) { // Update cc mode and register event callback only when mdpp vconf key exists
@@ -138,6 +145,7 @@ int main(void) {
     else
         SLOG(LOG_DEBUG, CKM_LISTENER_TAG,
             "vconfCCModeChanged event callback is not registered. No vconf key exists : %s", VCONFKEY_SECURITY_MDPP_STATE);
+#endif
 
     SLOG(LOG_DEBUG, CKM_LISTENER_TAG, "%s", "Ready to listen!");
     g_main_loop_run(main_loop);

diff --git a/src/manager/service/access-control.cpp b/src/manager/service/access-control.cpp
index d87973b..b9d49ee 100644 (file)
--- a/src/manager/service/access-control.cpp
+++ b/src/manager/service/access-control.cpp
@@ -19,14 +19,17 @@
  * @version     1.0
  * @brief       DB access control layer implementation.
  */
-#include <vconf/vconf.h>
 #include <access-control.h>
 #include <dpl/log/log.h>
 #include <ckm/ckm-error.h>
 #include <ckm/ckm-type.h>
 #include <openssl/crypto.h>
 
-#ifndef VCONFKEY_SECURITY_MDPP_STATE
+#ifdef SECURITY_MDFPP_STATE_ENABLE
+#include <vconf/vconf.h>
+#endif
+
+#if defined(SECURITY_MDFPP_STATE_ENABLE) && !defined(VCONFKEY_SECURITY_MDPP_STATE)
 #define VCONFKEY_SECURITY_MDPP_STATE "file/security_mdpp/security_mdpp_state"
 #endif
 
@@ -43,7 +46,11 @@ void AccessControl::updateCCMode() {
     int rc = 0;
     bool newMode;
 
+#ifdef SECURITY_MDFPP_STATE_ENABLE
     char *mdppState = vconf_get_str(VCONFKEY_SECURITY_MDPP_STATE);
+#else
+    char *mdppState = NULL;
+#endif
     newMode = ( mdppState && (!strcmp(mdppState, MDPP_MODE_ENABLED) ||
                               !strcmp(mdppState, MDPP_MODE_ENFORCING) ||
                               !strcmp(mdppState, MDPP_MODE_DISABLED)));

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index bfbfb4f..445660a 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -19,7 +19,6 @@
  * @version     1.0
  * @brief       Sample service implementation.
  */
-#include <vconf/vconf.h>
 #include <dpl/serialization.h>
 #include <dpl/log/log.h>
 #include <ckm/ckm-error.h>