From: Bartlomiej Grzelewski <b.grzelewski@samsung.com>
Date: Wed, 27 Jan 2016 16:45:05 +0000 (+0100)
Subject: Merge branch 'ckm' into tizen
X-Git-Tag: security-manager_5.5_testing~110
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F58125%2F1;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

Merge branch 'ckm' into tizen

Change-Id: Ia52221f3c05fa81a4d5b53bd183ca0174f49020e
---

c5cb3658f18ee7c3d0704a40065cd751554766da
diff --cc src/ckm/CMakeLists.txt
index dfdc418,7ffa6a2..87696f1
--- a/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