Merge remote-tracking branch 'origin/tizen' into ode

Change-Id: I50afe029d7b1dc04d8c77fb648ab923c7a41aee7

diff --combined CMakeLists.txt
index 93498f4,01ce9fb..ce88a43
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -64,7 -64,6 +64,7 @@@ IF(BUILD_ALL_TESTS
      SET(BUILD_CYNARA ON)
      SET(BUILD_WEB ON)
      SET(BUILD_YACA ON)
 +    SET(BUILD_ODE ON)
  ENDIF(BUILD_ALL_TESTS)
  
  # If supported for the target machine, emit position-independent code,suitable
@@@ -101,7 -100,9 +101,9 @@@ ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX
  
  ############################# Targets names ###################################
  
+ SET(TARGET_CKM_TEST_COMMON "ckm-test-common")
  SET(TARGET_CKM_TESTS "ckm-tests")
+ SET(TARGET_CKM_PRIVILEGED_TESTS "ckm-privileged-tests")
  SET(TARGET_CKMI_TESTS "ckm-integration-tests")
  SET(COMMON_TARGET_TEST "tests-common")
  

diff --combined packaging/security-tests.spec
index 80ab147,f96f79b..2d3e333
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -14,7 -14,6 +14,7 @@@ BuildRequires: pkgconfig(libsmack
  BuildRequires: pkgconfig(security-manager)
  BuildRequires: pkgconfig(key-manager)
  BuildRequires: pkgconfig(yaca)
 +BuildRequires: pkgconfig(ode)
  BuildRequires: pkgconfig(dlog)
  BuildRequires: pkgconfig(glib-2.0)
  BuildRequires: pkgconfig(dbus-1)
@@@ -22,6 -21,7 +22,7 @@@ BuildRequires: pkgconfig(libpcrecpp
  BuildRequires: pkgconfig(libxml-2.0)
  BuildRequires: pkgconfig(sqlite3)
  BuildRequires: pkgconfig(libwebappenc)
+ BuildRequires: pkgconfig(openssl)
  BuildRequires: cynara-devel
  BuildRequires: libcynara-creds-dbus-devel
  BuildRequires: libcynara-creds-gdbus-devel
@@@ -99,9 -99,10 +100,11 @@@ echo "security-tests postinst done ...
  %attr(755, security_test_user,users) %{TZ_SYS_HOME}/security_test_user/apps_rw/*
  /usr/bin/cynara-test
  /usr/bin/ckm-tests
+ /usr/bin/ckm-privileged-tests
+ /usr/bin/ckm-tests-on-onlycap.sh
  /usr/bin/ckm-integration-tests
  /usr/bin/yaca-test
 +/usr/bin/ode-tests
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*