Merge branch 'ckm' into tizen

Change-Id: Ia52221f3c05fa81a4d5b53bd183ca0174f49020e

diff --cc packaging/security-tests.spec
Simple merge

diff --cc src/ckm/CMakeLists.txt
index dfdc4185a7c1d3732c7c28e1d9f7d909bad6880f,7ffa6a2f586b1d8a18005e66b5f6c52e6e185910..87696f19c9b9b1d69397d2ae87b68ad3b71dc50c
--- 1/src/ckm/CMakeLists.txt
--- 2/src/ckm/CMakeLists.txt
+++ b/src/ckm/CMakeLists.txt
@@@ -45,9 -48,11 +48,10 @@@ SET(CKM_SOURCE
      ${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
 -    ${PROJECT_SOURCE_DIR}/src/ckm/clean-env.cpp
      ${PROJECT_SOURCE_DIR}/src/ckm/test-certs.cpp
      ${PROJECT_SOURCE_DIR}/src/ckm/algo-params.cpp
      ${PROJECT_SOURCE_DIR}/src/ckm/encryption-decryption-env.cpp