Merge branch 'tizen' into 'ode'

Change-Id: Ia15ecf4c082ffcf5dae47586fda10f7f48bab99c

diff --combined packaging/security-tests.spec
index efe5a96,2df0f8f..5beb376
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -16,7 -16,6 +16,7 @@@ BuildRequires: pkgconfig(key-manager
  BuildRequires: key-manager-initial-values
  BuildRequires: util-linux
  BuildRequires: pkgconfig(yaca)
 +BuildRequires: pkgconfig(ode)
  BuildRequires: pkgconfig(dlog)
  BuildRequires: pkgconfig(glib-2.0)
  BuildRequires: pkgconfig(dbus-1)
@@@ -24,7 -23,7 +24,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
@@@ -53,9 -52,6 +53,9 @@@ Security tests repository - for tests t
  export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib"
  
  cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 +%if "%{_with_emulator}" == "1"
 +        -DEMULATOR="ON"                   \
 +%endif
  %if %{tz_backend_enabled} == ON
          -DTZ_BACKEND="ON"                 \
  %endif
@@@ -114,7 -110,6 +114,7 @@@ echo "security-tests postinst done ...
  %caps(cap_mac_admin=ep) /usr/bin/ckm-privileged-tests
  %caps(cap_mac_admin=ep) /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/*