CKM: Remove ccMode related code.

Support for MDPP state was removed from key-manager code.
Also the change of ccMode is no longer suppoted in key-manager.

Change-Id: Ic06bc7294aeeb1a0d795154cb636d3977d8d330d

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index bb5d572..4f8930a 100644 (file)
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -71,10 +71,10 @@ find /etc/smack/test_privilege_control_DIR/ -type f -name exec -exec chmod 0755
 api_feature_loader --verbose
 
 # Set vconf key for cc-mode testing if vconf key isn't there.
-%if "%{sec_product_feature_security_mdfpp_enable}" != "1"
-    echo "Install vconf key (file/security_mdpp/security_mdpp_state) for testing key-manager"
-    vconftool set -t string file/security_mdpp/security_mdpp_state "Unset"
-%endif
+#%if "%{sec_product_feature_security_mdfpp_enable}" != "1"
+#    echo "Install vconf key (file/security_mdpp/security_mdpp_state) for testing key-manager"
+#    vconftool set -t string file/security_mdpp/security_mdpp_state "Unset"
+#%endif
 
 id -u  security_test_user 1>/dev/null 2>&1 || \
     useradd -r -g users -s /sbin/nologin -c "for tests only" security_test_user

diff --git a/src/ckm/CMakeLists.txt b/src/ckm/CMakeLists.txt
index d582601..f93a9ea 100644 (file)
--- a/src/ckm/CMakeLists.txt
+++ b/src/ckm/CMakeLists.txt
@@ -51,7 +51,7 @@ SET(CKM_SOURCES
     ${PROJECT_SOURCE_DIR}/src/ckm/capi-access_control.cpp
     ${PROJECT_SOURCE_DIR}/src/ckm/async-api.cpp
     ${PROJECT_SOURCE_DIR}/src/ckm/ckm-common.cpp
-    ${PROJECT_SOURCE_DIR}/src/ckm/cc-mode.cpp
+#    ${PROJECT_SOURCE_DIR}/src/ckm/cc-mode.cpp
 #    ${PROJECT_SOURCE_DIR}/src/ckm/password-integration.cpp
     ${PROJECT_SOURCE_DIR}/src/ckm/system-db.cpp
     ${PROJECT_SOURCE_DIR}/src/ckm/initial-values.cpp