Merge branch 'tizen' into 'ckm'

Change-Id: If83694b3e0cd759296da5b920ec0adb50dcc54c2

diff --combined packaging/security-tests.spec
index 3508f3b,2df0f8f..96a3bb9
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -23,7 -23,7 +23,7 @@@ BuildRequires: pkgconfig(libpcrecpp
  BuildRequires: pkgconfig(libxml-2.0)
  BuildRequires: pkgconfig(sqlite3)
  BuildRequires: pkgconfig(libwebappenc)
- BuildRequires: pkgconfig(openssl)
+ BuildRequires: pkgconfig(openssl1.1)
  BuildRequires: cynara-devel
  BuildRequires: libcynara-creds-dbus-devel
  BuildRequires: libcynara-creds-gdbus-devel
@@@ -34,7 -34,6 +34,7 @@@ BuildRequires: pkgconfig(vconf
  BuildRequires: pkgconfig(libgum) >= 1.0.5
  BuildRequires: pkgconfig(security-privilege-manager)
  BuildRequires: pkgconfig(libsystemd)
 +BuildRequires: openssl1.1
  Requires: perf
  Requires: gdb
  Requires: diffutils

diff --combined src/ckm/CMakeLists.txt
index 90b0d4f,9ccc124..97f1239
--- 1/src/ckm/CMakeLists.txt
--- 2/src/ckm/CMakeLists.txt
+++ b/src/ckm/CMakeLists.txt
@@@ -29,10 -29,6 +29,10 @@@ ENDIF (DEFINED SECURITY_MDFPP_STATE_ENA
  
  ADD_DEFINITIONS("-DCKM_TEST_DIR=\"${CKM_TEST_DIR}\"")
  ADD_DEFINITIONS("-DCKM_RW_DATA_DIR=\"${CKM_RW_DATA_DIR}\"")
 +OPTION("TZ_BACKEND" OFF)
 +IF(TZ_BACKEND)
 +    ADD_DEFINITIONS("-DTZ_BACKEND")
 +ENDIF(TZ_BACKEND)
  
  OPTION("TZ_BACKEND" OFF)
  IF(TZ_BACKEND)
@@@ -41,7 -37,7 +41,7 @@@ ENDIF(TZ_BACKEND
  
  PKG_CHECK_MODULES(CKM_TEST_COMMON_DEP
      REQUIRED
-     openssl
+     openssl1.1
      key-manager
      libtzplatform-config
  )