Merge branch 'ckm' into tizen

Change-Id: I568bc8337c9fca77181af04283efd7c28e1ddcdc

diff --combined packaging/security-tests.manifest
index 0374731,0f1fc1f..dfda779
--- 1/packaging/security-tests.manifest
--- 2/packaging/security-tests.manifest
+++ b/packaging/security-tests.manifest
@@@ -1,8 -1,11 +1,9 @@@
  <manifest>
      <assign>
 -        <filesystem path="/usr/bin/test-performance-check.sh" exec_label="_" />
 -
          <filesystem path="/usr/bin/security-manager-tests" exec_label="System::Privileged" />
          <filesystem path="/usr/bin/cynara-tests" exec_label="_" />
          <filesystem path="/usr/bin/ckm-tests" exec_label="User" />
+         <filesystem path="/usr/bin/e2ee-tests" exec_label="User" />
          <filesystem path="/usr/bin/ckm-privileged-tests" exec_label="System::Privileged" />
          <filesystem path="/usr/bin/nether-tests" exec_label="System::Privileged" />
          <filesystem path="/usr/bin/libteec-tests" exec_label="System::Privileged" />

diff --combined packaging/security-tests.spec
index 99ac084,51017be..0f99419
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -12,7 -12,7 +12,7 @@@ BuildRequires: libattr-deve
  BuildRequires: pkgconfig(libcap)
  BuildRequires: pkgconfig(libsmack)
  BuildRequires: pkgconfig(security-manager)
- BuildRequires: pkgconfig(key-manager)
+ BuildRequires: pkgconfig(key-manager) >= 0.1.49
  BuildRequires: key-manager-initial-values
  BuildRequires: util-linux
  BuildRequires: pkgconfig(yaca)
@@@ -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
@@@ -98,6 -100,7 +99,6 @@@ echo "security-tests postinst done ...
  %defattr(-, root, root, -)
  /usr/bin/security-tests.sh
  /usr/bin/security-tests-all.sh
 -/usr/bin/test-performance-check.sh
  /usr/bin/setup-nether-tests-nns.sh
  /usr/bin/teardown-nether-tests-nns.sh
  /usr/bin/setup-nether-tests-dns.sh
@@@ -115,6 -118,7 +116,7 @@@
  /usr/bin/yaca-test
  /usr/bin/nether-tests
  /usr/bin/ode-tests
+ /usr/bin/e2ee-tests
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*

diff --combined src/CMakeLists.txt
index 9a6f938,7799501..743513f
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -78,6 -78,18 +78,6 @@@ INSTALL(FILES ${PROJECT_SOURCE_DIR}/src
                  WORLD_EXECUTE
      )
  
 -INSTALL(FILES
 -    ${PROJECT_SOURCE_DIR}/src/test-performance-check.sh
 -    DESTINATION bin
 -    PERMISSIONS OWNER_READ
 -                OWNER_WRITE
 -                OWNER_EXECUTE
 -                GROUP_READ
 -                GROUP_EXECUTE
 -                WORLD_READ
 -                WORLD_EXECUTE
 -    )
 -
  IF(BUILD_CKM OR BUILD_SM OR BUILD_CYNARA OR BUILD_WEB)
      ADD_SUBDIRECTORY(common)
  ENDIF(BUILD_CKM OR BUILD_SM OR BUILD_CYNARA OR BUILD_WEB)
@@@ -110,3 -122,7 +110,7 @@@ ENDIF(BUILD_NETHER
  IF(BUILD_ODE)
      ADD_SUBDIRECTORY(ode)
  ENDIF(BUILD_ODE)
+ 
+ IF(BUILD_E2EE_ADAPTATION_LAYER)
+     ADD_SUBDIRECTORY(e2ee-adaptation-layer)
+ ENDIF(BUILD_E2EE_ADAPTATION_LAYER)