client-key, client-key-impl, client-certificate, and client-certificate-impl are...

Change-Id: I85d74b5e5fd3c7a6a38da654b3c79ad2e86dcea7
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8cf83d6..47a3b95 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,12 +68,8 @@ SET(KEY_MANAGER_CLIENT_SOURCES
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-control.cpp
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-common.cpp
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-echo.cpp
-    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-key.cpp
-    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-key-impl.cpp
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-manager.cpp
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-manager-impl.cpp
-    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-certificate.cpp
-    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-certificate-impl.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CLIENT} SHARED ${KEY_MANAGER_CLIENT_SOURCES})

diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt
index d609992..78c4320 100644 (file)
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -19,6 +19,10 @@ SET(COMMON_SOURCES
     ${COMMON_PATH}/common/message-buffer.cpp
     ${COMMON_PATH}/common/smack-check.cpp
     ${COMMON_PATH}/common/Base64.cpp
+    ${COMMON_PATH}/common/client-certificate.cpp
+    ${COMMON_PATH}/common/client-certificate-impl.cpp
+    ${COMMON_PATH}/common/client-key.cpp
+    ${COMMON_PATH}/common/client-key-impl.cpp
     ${COMMON_PATH}/dpl/log/src/abstract_log_provider.cpp
     ${COMMON_PATH}/dpl/log/src/dlog_log_provider.cpp
     ${COMMON_PATH}/dpl/log/src/log.cpp

diff --git a/src/manager/client/client-certificate-impl.cpp b/src/manager/common/client-certificate-impl.cpp
similarity index 100%
rename from src/manager/client/client-certificate-impl.cpp
rename to src/manager/common/client-certificate-impl.cpp

diff --git a/src/manager/client/client-certificate-impl.h b/src/manager/common/client-certificate-impl.h
similarity index 94%
rename from src/manager/client/client-certificate-impl.h
rename to src/manager/common/client-certificate-impl.h
index d1a18d9..e8ca05f 100644 (file)
--- a/src/manager/client/client-certificate-impl.h
+++ b/src/manager/common/client-certificate-impl.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include <memory>
+#include <vector>
 #include <ckm/ckm-type.h>
 #include <ckm/key-manager.h>
 
@@ -46,5 +47,7 @@ protected:
     X509* m_x509;
 };
 
+typedef std::vector<CertificateImpl> CertificateImplVector;
+
 } // namespace CKM
 

diff --git a/src/manager/client/client-certificate.cpp b/src/manager/common/client-certificate.cpp
similarity index 100%
rename from src/manager/client/client-certificate.cpp
rename to src/manager/common/client-certificate.cpp

diff --git a/src/manager/client/client-key-impl.cpp b/src/manager/common/client-key-impl.cpp
similarity index 100%
rename from src/manager/client/client-key-impl.cpp
rename to src/manager/common/client-key-impl.cpp

diff --git a/src/manager/client/client-key-impl.h b/src/manager/common/client-key-impl.h
similarity index 100%
rename from src/manager/client/client-key-impl.h
rename to src/manager/common/client-key-impl.h

diff --git a/src/manager/client/client-key.cpp b/src/manager/common/client-key.cpp
similarity index 100%
rename from src/manager/client/client-key.cpp
rename to src/manager/common/client-key.cpp