Remove cycle dependencies between common and client libraries.

* Moved client-certificate-impl and client-key-impl to common library.
* Changed client-certificate-impl into certificate-impl.
* Changed name client-key-impl int key-impl.

Change-Id: I2a49685f4a885300c6f438a284aac8d180ab752d

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7dbd66b..043d00c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,9 +66,11 @@ INCLUDE_DIRECTORIES(
     )
 
 SET(KEY_MANAGER_CLIENT_SOURCES
+    ${KEY_MANAGER_CLIENT_SRC_PATH}/client-certificate.cpp
     ${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-manager.cpp
     ${KEY_MANAGER_CLIENT_SRC_PATH}/client-manager-impl.cpp
     )

diff --git a/src/include/ckm/ckm-type.h b/src/include/ckm/ckm-type.h
index 0f0bf8c..e59d8d7 100644 (file)
--- a/src/include/ckm/ckm-type.h
+++ b/src/include/ckm/ckm-type.h
@@ -40,6 +40,18 @@ enum class KeyType : int {
     KEY_AES
 };
 
+enum class DataFormat : int {
+    FORM_DER_BASE64,
+    FORM_DER,
+    FORM_PEM
+};
+
+enum class ElipticCurve : int {
+    prime192v1,
+    prime256v1,
+    secp384r1
+};
+
 struct Policy {
     Policy(const std::string &pass = std::string(), bool extract = true, bool rest = false)
       : password(pass)

diff --git a/src/include/ckm/key-manager.h b/src/include/ckm/key-manager.h
index 5611dd1..24fd65f 100644 (file)
--- a/src/include/ckm/key-manager.h
+++ b/src/include/ckm/key-manager.h
@@ -62,12 +62,6 @@ private:
 
 class Key {
 public:
-    enum class ECType : unsigned int {
-        prime192v1,
-       prime256v1,
-       secp384r1
-    };
-
     Key();
     Key(const RawBuffer &rawData, KeyType type, const std::string &password = std::string()); // Import key
     Key(const Key &key);
@@ -77,7 +71,7 @@ public:
     bool empty() const;
     KeyType getType() const;
     int getSize() const;
-       ECType getCurve() const;
+       ElipticCurve getCurve() const;
     RawBuffer getKey() const;
     KeyImpl* getImpl() const;
 
@@ -93,13 +87,8 @@ public:
 //        FINGERPRINT_SHA256
 //    };
 
-    enum class Format : unsigned int {
-        FORM_BASE64,
-        FORM_DER
-    };
-
     Certificate();
-    Certificate(const RawBuffer &rawData, Format format);
+    Certificate(const RawBuffer &rawData, DataFormat format);
        Certificate(const Certificate &certificate);
        Certificate& operator=(const Certificate &certificate);
 

diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt
index 78c4320..e4c67ac 100644 (file)
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -15,14 +15,12 @@ PKG_CHECK_MODULES(KEY_PROVIDER_DEP
 SET(COMMON_PATH ${PROJECT_SOURCE_DIR}/src/manager)
 
 SET(COMMON_SOURCES
+    ${COMMON_PATH}/common/base64.cpp
     ${COMMON_PATH}/common/protocols.cpp
     ${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}/common/certificate-impl.cpp
+    ${COMMON_PATH}/common/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/common/client-certificate.cpp b/src/manager/client/client-certificate.cpp
similarity index 93%
rename from src/manager/common/client-certificate.cpp
rename to src/manager/client/client-certificate.cpp
index cd1a3f4..c1087ce 100644 (file)
--- a/src/manager/common/client-certificate.cpp
+++ b/src/manager/client/client-certificate.cpp
@@ -21,13 +21,13 @@
 
 #include <ckm/key-manager.h>
 
-#include <client-certificate-impl.h>
+#include <certificate-impl.h>
 
 namespace CKM {
 
 Certificate::Certificate(){}
 
-Certificate::Certificate(const RawBuffer &rawData, Format format)
+Certificate::Certificate(const RawBuffer &rawData, DataFormat format)
   : m_impl(new CertificateImpl(rawData, format))
 {}
 

diff --git a/src/manager/common/client-key.cpp b/src/manager/client/client-key.cpp
similarity index 98%
rename from src/manager/common/client-key.cpp
rename to src/manager/client/client-key.cpp
index d2aef87..9162ff8 100644 (file)
--- a/src/manager/common/client-key.cpp
+++ b/src/manager/client/client-key.cpp
@@ -21,7 +21,7 @@
 #include <ckm/ckm-type.h>
 #include <ckm/key-manager.h>
 
-#include <client-key-impl.h>
+#include <key-impl.h>
 
 namespace CKM {
 

diff --git a/src/manager/client/client-manager-impl.cpp b/src/manager/client/client-manager-impl.cpp
index 162b247..53ec02a 100644 (file)
--- a/src/manager/client/client-manager-impl.cpp
+++ b/src/manager/client/client-manager-impl.cpp
@@ -22,7 +22,7 @@
 
 #include <client-manager-impl.h>
 #include <client-common.h>
-#include <client-key-impl.h>
+#include <key-impl.h>
 #include <message-buffer.h>
 #include <protocols.h>
 
@@ -225,7 +225,7 @@ int Manager::ManagerImpl::getCertificate(const Alias &alias, const std::string &
     if (recvDataType != DBDataType::CERTIFICATE)
         return KEY_MANAGER_API_ERROR_BAD_RESPONSE;
 
-    Certificate certParsed(rawData, Certificate::Format::FORM_DER);
+    Certificate certParsed(rawData, DataFormat::FORM_DER);
 
     if (certParsed.empty())
         return KEY_MANAGER_API_ERROR_BAD_RESPONSE;

diff --git a/src/manager/common/Base64.cpp b/src/manager/common/base64.cpp
similarity index 99%
rename from src/manager/common/Base64.cpp
rename to src/manager/common/base64.cpp
index 72bd960..1be549b 100644 (file)
--- a/src/manager/common/Base64.cpp
+++ b/src/manager/common/base64.cpp
@@ -23,7 +23,7 @@
 
 #include <dpl/log/log.h>
 
-#include <Base64.h>
+#include <base64.h>
 
 namespace CKM {
 

diff --git a/src/manager/common/Base64.h b/src/manager/common/base64.h
similarity index 100%
rename from src/manager/common/Base64.h
rename to src/manager/common/base64.h

diff --git a/src/manager/common/client-certificate-impl.cpp b/src/manager/common/certificate-impl.cpp
similarity index 92%
rename from src/manager/common/client-certificate-impl.cpp
rename to src/manager/common/certificate-impl.cpp
index c8ee62e..fab5596 100644 (file)
--- a/src/manager/common/client-certificate-impl.cpp
+++ b/src/manager/common/certificate-impl.cpp
@@ -22,17 +22,17 @@
 
 #include <dpl/log/log.h>
 
-#include <client-certificate-impl.h>
-#include <Base64.h>
+#include <certificate-impl.h>
+#include <base64.h>
 
 namespace CKM {
 
-CertificateImpl::CertificateImpl(const RawBuffer &der, Certificate::Format format) {
+CertificateImpl::CertificateImpl(const RawBuffer &der, DataFormat format) {
     int size;
     const unsigned char *ptr;
     RawBuffer tmp;
 
-    if (Certificate::Format::FORM_BASE64 == format) {
+    if (DataFormat::FORM_DER_BASE64 == format) {
         Base64Decoder base64;
         base64.reset();
         base64.append(der);

diff --git a/src/manager/common/client-certificate-impl.h b/src/manager/common/certificate-impl.h
similarity index 92%
rename from src/manager/common/client-certificate-impl.h
rename to src/manager/common/certificate-impl.h
index a5ca743..2ea7461 100644 (file)
--- a/src/manager/common/client-certificate-impl.h
+++ b/src/manager/common/certificate-impl.h
@@ -24,7 +24,6 @@
 #include <memory>
 #include <vector>
 #include <ckm/ckm-type.h>
-#include <ckm/key-manager.h>
 
 extern "C" {
 struct x509_st;
@@ -36,7 +35,7 @@ namespace CKM {
 class CertificateImpl {
 public:
     CertificateImpl(){}
-    CertificateImpl(const RawBuffer &data, Certificate::Format format);
+    CertificateImpl(const RawBuffer &data, DataFormat format);
     CertificateImpl& operator=(const CertificateImpl &);
     RawBuffer getDER() const;
     bool empty() const;

diff --git a/src/manager/common/client-key-impl.cpp b/src/manager/common/key-impl.cpp
similarity index 99%
rename from src/manager/common/client-key-impl.cpp
rename to src/manager/common/key-impl.cpp
index 9d960a5..aec0294 100644 (file)
--- a/src/manager/common/client-key-impl.cpp
+++ b/src/manager/common/key-impl.cpp
@@ -21,7 +21,7 @@
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 
-#include <client-key-impl.h>
+#include <key-impl.h>
 
 namespace {
 

diff --git a/src/manager/common/client-key-impl.h b/src/manager/common/key-impl.h
similarity index 95%
rename from src/manager/common/client-key-impl.h
rename to src/manager/common/key-impl.h
index 9f9c891..5a1a88b 100644 (file)
--- a/src/manager/common/client-key-impl.h
+++ b/src/manager/common/key-impl.h
@@ -20,10 +20,7 @@
  */
 #pragma once
 
-//#include <dpl/serialization.h>
-
 #include <ckm/ckm-type.h>
-#include <ckm/key-manager.h>
 
 namespace CKM {
 

diff --git a/src/manager/service/CryptoService.cpp b/src/manager/service/CryptoService.cpp
index 4afac27..bc64635 100644 (file)
--- a/src/manager/service/CryptoService.cpp
+++ b/src/manager/service/CryptoService.cpp
@@ -16,7 +16,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/obj_mac.h>
 #include <ckm/ckm-type.h>
-#include <client-key-impl.h>
+#include <key-impl.h>
 #include <CryptoService.h>
 #include <key-manager-util.h>
 
@@ -224,7 +224,7 @@ int CryptoService::createKeyPairRSA(const int size, // size in bits [1024, 2048,
        return CKM_CRYPTO_CREATEKEY_SUCCESS;
 }
 
-int CryptoService::createKeyPairECDSA(const Key::ECType type,
+int CryptoService::createKeyPairECDSA(ElipticCurve type,
                KeyImpl &createdPrivateKey,  // returned value
                KeyImpl &createdPublicKey)  // returned value
 {
@@ -238,14 +238,14 @@ int CryptoService::createKeyPairECDSA(const Key::ECType type,
                RawBuffer priKey_tmp, pubKey_tmp, null_password;
 
                switch(type) {
-                       case Key::ECType::prime192v1: 
-                               ecCurve = NID_X9_62_prime192v1; 
+                       case ElipticCurve::prime192v1:
+                               ecCurve = NID_X9_62_prime192v1;
                                break;
-                       case Key::ECType::prime256v1: 
-                               ecCurve = NID_X9_62_prime256v1; 
+                       case ElipticCurve::prime256v1:
+                               ecCurve = NID_X9_62_prime256v1;
                                break;
-                       case Key::ECType::secp384r1: 
-                               ecCurve = NID_secp384r1; 
+                       case ElipticCurve::secp384r1:
+                               ecCurve = NID_secp384r1;
                                break;
                }
 
@@ -579,7 +579,7 @@ int CryptoService::verifyCertificateChain(const CertificateImpl &certificate,
        RawBuffer tmpBuf;
        for(unsigned int i=0;i<chain.size();i++) {
                x509ToRawBuffer(tmpBuf, chain[i]);
-               CertificateImpl tmpCertImpl((const RawBuffer)tmpBuf,Certificate::Format::FORM_DER);
+               CertificateImpl tmpCertImpl((const RawBuffer)tmpBuf, DataFormat::FORM_DER);
                certificateChainVector.push_back(tmpCertImpl);
        }
 

diff --git a/src/manager/service/CryptoService.h b/src/manager/service/CryptoService.h
index 8c690b9..88cd3ce 100644 (file)
--- a/src/manager/service/CryptoService.h
+++ b/src/manager/service/CryptoService.h
@@ -2,9 +2,8 @@
 
 #include <iostream>
 
-#include <client-key-impl.h>
-#include <client-certificate-impl.h>
-#include <ckm/key-manager.h>
+#include <key-impl.h>
+#include <certificate-impl.h>
 #include <ckm/ckm-type.h>
 #include <string.h>
 #include <vector>
@@ -56,7 +55,7 @@ class CryptoService {
                          KeyImpl &createdPrivateKey,  // returned value ==> Key &createdPrivateKey,
                          KeyImpl &createdPublicKey);  // returned value ==> Key &createdPublicKey
 
-     int createKeyPairECDSA(const Key::ECType type1,
+     int createKeyPairECDSA(ElipticCurve type1,
                                         KeyImpl &createdPrivateKey,  // returned value
                                         KeyImpl &createdPublicKey);  // returned value
 

diff --git a/src/manager/service/DBCryptoModule.cpp b/src/manager/service/DBCryptoModule.cpp
index 7e44cf2..6a2e059 100644 (file)
--- a/src/manager/service/DBCryptoModule.cpp
+++ b/src/manager/service/DBCryptoModule.cpp
@@ -10,7 +10,7 @@
 #include <openssl/sha.h>
 
 #include <dpl/log/log.h>
-#include <Base64.h>
+#include <base64.h>
 
 #include <DBCryptoModule.h>
 

diff --git a/src/manager/service/ckm-service.cpp b/src/manager/service/ckm-service.cpp
index 5712bc7..d100045 100644 (file)
--- a/src/manager/service/ckm-service.cpp
+++ b/src/manager/service/ckm-service.cpp
@@ -30,7 +30,7 @@
 
 #include <ckm-service.h>
 #include <ckm-logic.h>
-#include <client-key-impl.h>
+#include <key-impl.h>
 
 namespace {
 const CKM::InterfaceID SOCKET_ID_CONTROL = 0;

diff --git a/src/manager/service/ocsp.h b/src/manager/service/ocsp.h
index 1a44dc8..ab773b1 100644 (file)
--- a/src/manager/service/ocsp.h
+++ b/src/manager/service/ocsp.h
@@ -3,7 +3,7 @@
 
 #include <openssl/x509v3.h>
 #include <ckm/ckm-type.h>
-#include <client-certificate-impl.h>
+#include <certificate-impl.h>
 
 
 #define OCSP_STATUS_GOOD                               1