Merge branch 'ckm' into tizen

Change-Id: I568bc8337c9fca77181af04283efd7c28e1ddcdc

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

diff --cc packaging/security-tests.spec
index 99ac084,51017be..0f99419
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -35,7 -35,9 +35,8 @@@ BuildRequires: pkgconfig(vconf
  BuildRequires: pkgconfig(libgum) >= 1.0.5
  BuildRequires: pkgconfig(security-privilege-manager)
  BuildRequires: pkgconfig(libsystemd)
+ BuildRequires: pkgconfig(device-certificate-manager) >= 2.1
  BuildRequires: openssl1.1
 -Requires: perf
  Requires: gdb
  Requires: diffutils
  Requires: iproute2

diff --cc src/CMakeLists.txt
Simple merge