Merge branch 'ckm' into tizen

Change-Id: I96b738bb76659cbd11a6b110c6173378d476fffd

diff --combined packaging/security-tests.spec
index 709a3e6,66680e6..f96f79b
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -21,6 -21,7 +21,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
@@@ -63,15 -64,14 +64,15 @@@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefi
          -DLOCAL_APP_DIR="%{TZ_SYS_HOME}/security_test_user/apps_rw"
  make %{?jobs:-j%jobs}
  
 +%pre
 +id -u  security_test_user 1>/dev/null 2>&1 || \
 +    gum-utils -o -a --username=security_test_user --usertype=normal
 +
  %install
  %make_install
  ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
  
  %post
 -id -u  security_test_user 1>/dev/null 2>&1 || \
 -    gum-utils -o -a --username=security_test_user --usertype=normal
 -
  # Reload dbus daemon to apply newly installed configuration
  systemctl reload dbus
  
@@@ -95,9 -95,11 +96,11 @@@ echo "security-tests postinst done ...
  /etc/smack/test_smack_rules
  /etc/smack/test_smack_rules_lnk
  %{TZ_SYS_RW_APP}*
 -%{TZ_SYS_HOME}/security_test_user/apps_rw/*
 +%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
  %{ckm_test_dir}/*

diff --combined src/common/tests_common.h
index 3f109b9,0a2b183..3e829f1
--- 1/src/common/tests_common.h
--- 2/src/common/tests_common.h
+++ b/src/common/tests_common.h
@@@ -29,16 -29,15 +29,16 @@@
  #include <dpl/test/test_runner.h>
  #include <dpl/test/test_runner_child.h>
  #include <dpl/test/test_runner_multiprocess.h>
 -#include <sys/smack.h>
 +
 +#include <algorithm>
  #include <sys/types.h>
  #include <string>
  #include <tuple>
  #include <errno.h>
  #include <string.h>
  
- const uid_t APP_UID     = 5000;
- const gid_t APP_GID     = 5000;
+ const uid_t APP_UID     = 5001;
+ const gid_t APP_GID     = 5001;
  const uid_t APP_UID_2   = 5200;
  const gid_t APP_GID_2   = 5200;
  const uid_t DB_ALARM_UID = 6001;
@@@ -60,9 -59,6 +60,9 @@@ void removeDir(const std::string &path)
  void waitPid(pid_t pid);
  void change_label(const char* label);
  
 +pid_t runInChild(const std::function<void(void)> &process);
 +void runInChildParentWait(const std::function<void(void)> &process);
 +
  #define RUNNER_TEST_SMACK(Proc, ...)                                                        \
      void Proc(std::tuple<__VA_ARGS__> &optionalArgsTuple);                                  \
      static int Static##Proc##Init()                                                         \