Merge branch 'tizen' into 'ckm'

Change-Id: If83694b3e0cd759296da5b920ec0adb50dcc54c2

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index 3508f3b..96a3bb9 100644 (file)
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -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

diff --git a/src/ckm/CMakeLists.txt b/src/ckm/CMakeLists.txt
index 90b0d4f..97f1239 100644 (file)
--- a/src/ckm/CMakeLists.txt
+++ b/src/ckm/CMakeLists.txt
@@ -41,7 +41,7 @@ ENDIF(TZ_BACKEND)
 
 PKG_CHECK_MODULES(CKM_TEST_COMMON_DEP
     REQUIRED
-    openssl
+    openssl1.1
     key-manager
     libtzplatform-config
 )

diff --git a/src/common/service_manager.cpp b/src/common/service_manager.cpp
index c571d5f..4441ace 100644 (file)
--- a/src/common/service_manager.cpp
+++ b/src/common/service_manager.cpp
@@ -283,10 +283,10 @@ void ServiceManager::executeMethod(const std::string &method, const std::string
 
 void ServiceManager::startService(bool withSockets)
 {
-    executeMethod("StartUnit", m_serviceName);
     if (withSockets)
         for (const auto &socket : m_socketsNames)
             executeMethod("StartUnit", socket);
+    executeMethod("StartUnit", m_serviceName);
 }
 
 void ServiceManager::stopService(bool withSockets)