Encryption/decryption API

[platform/core/security/key-manager.git] / src / manager / client-capi / ckmc-manager.cpp

diff --git a/src/manager/client-capi/ckmc-manager.cpp b/src/manager/client-capi/ckmc-manager.cpp
index d4ba152..7a4c8f1 100644 (file)
--- a/src/manager/client-capi/ckmc-manager.cpp
+++ b/src/manager/client-capi/ckmc-manager.cpp
@@ -322,22 +322,9 @@ int ckmc_save_pkcs12(const char *alias, const ckmc_pkcs12_s *ppkcs, const ckmc_p
         return CKMC_ERROR_INVALID_PARAMETER;
     }
     CKM::Alias ckmAlias(alias);
-
     private_key = _toCkmKey(ppkcs->priv_key);
     cert = _toCkmCertificate(ppkcs->cert);
-    ckmc_cert_list_s *current = NULL;
-    ckmc_cert_list_s *next = const_cast<ckmc_cert_list_s *>(ppkcs->ca_chain);
-    do {
-        current = next;
-        next = current->next;
-
-        if(current->cert == NULL){
-            continue;
-        }
-
-        CKM::CertificateShPtr tmpCkmCert = _toCkmCertificate(current->cert);
-        ca_cert_list.push_back(tmpCkmCert);
-    }while(next != NULL);
+    ca_cert_list = _toCkmCertificateVector(ppkcs->ca_chain);
 
     CKM::Policy keyPolicy(_tostring(key_policy.password), key_policy.extractable);
     CKM::Policy certPolicy(_tostring(cert_policy.password), cert_policy.extractable);
@@ -357,44 +344,48 @@ int ckmc_remove_pkcs12(const char *alias)
 }
 
 KEY_MANAGER_CAPI
-int ckmc_get_pkcs12(const char *alias, ckmc_pkcs12_s **pkcs12)
+int ckmc_get_pkcs12(const char *alias, const char *key_password, const char *cert_password, ckmc_pkcs12_s **pkcs12)
 {
     int ret;
-    CKM::PKCS12ShPtr ShPkcs12;
-    CKM::PKCS12 *pkcs12Ptr = NULL;
+    CKM::PKCS12ShPtr pkcs;
+    CKM::Password keyPass, certPass;
     ckmc_key_s *private_key = NULL;
     ckmc_cert_s *cert = NULL;
     ckmc_cert_list_s *ca_cert_list = 0;
 
-    if(alias == NULL || pkcs12 == NULL) {
+    if(!alias || !pkcs12) {
         return CKMC_ERROR_INVALID_PARAMETER;
     }
 
-    CKM::ManagerShPtr mgr = CKM::Manager::create();
-    if( (ret = mgr->getPKCS12(alias, ShPkcs12)) != CKM_API_SUCCESS) {
+    if (key_password)
+        keyPass = key_password;
+
+    if (cert_password)
+        certPass = cert_password;
+
+    auto mgr = CKM::Manager::create();
+
+    if((ret = mgr->getPKCS12(alias, keyPass, certPass, pkcs)) != CKM_API_SUCCESS) {
         return to_ckmc_error(ret);
     }
 
-    pkcs12Ptr = ShPkcs12.get();
-    if(!pkcs12Ptr)
+    if(!pkcs)
         return CKMC_ERROR_BAD_RESPONSE;
 
-    if(pkcs12Ptr->getKey())
+    auto pkcsKey = pkcs->getKey();
+    if(pkcsKey)
     {
-        CKM::KeyShPtr helper = pkcs12Ptr->getKey();
-
-        CKM::RawBuffer buffer = helper->getDER();
-        ckmc_key_type_e keyType = static_cast<ckmc_key_type_e>(static_cast<int>(helper->getType()));
+        CKM::RawBuffer buffer = pkcsKey->getDER();
+        ckmc_key_type_e keyType = static_cast<ckmc_key_type_e>(pkcsKey->getType());
         ret = ckmc_key_new(buffer.data(), buffer.size(), keyType, NULL, &private_key);
         if(ret != CKMC_ERROR_NONE)
             return ret;
     }
 
-    if(pkcs12Ptr->getCertificate())
+    auto pkcsCert = pkcs->getCertificate();
+    if(pkcsCert)
     {
-        CKM::CertificateShPtr helper = pkcs12Ptr->getCertificate();
-
-        CKM::RawBuffer buffer = helper->getDER();
+        CKM::RawBuffer buffer = pkcsCert->getDER();
         ret = ckmc_cert_new(buffer.data(), buffer.size(), CKMC_FORM_DER, &cert);
         if(ret != CKMC_ERROR_NONE) {
             ckmc_key_free(private_key);
@@ -402,7 +393,7 @@ int ckmc_get_pkcs12(const char *alias, ckmc_pkcs12_s **pkcs12)
         }
     }
 
-    ca_cert_list = _toNewCkmCertList(pkcs12Ptr->getCaCertificateShPtrVector());
+    ca_cert_list = _toNewCkmCertList(pkcs->getCaCertificateShPtrVector());
 
     ret = ckmc_pkcs12_new(private_key, cert, ca_cert_list, pkcs12);
     if(ret != CKMC_ERROR_NONE)
@@ -414,6 +405,7 @@ int ckmc_get_pkcs12(const char *alias, ckmc_pkcs12_s **pkcs12)
     return ret;
 }
 
+
 KEY_MANAGER_CAPI
 int ckmc_save_data(const char *alias, ckmc_raw_buffer_s data, const ckmc_policy_s policy)
 {
@@ -697,11 +689,11 @@ int ckmc_get_cert_chain_with_alias(const ckmc_cert_s *cert, const ckmc_alias_lis
 }
 
 KEY_MANAGER_CAPI
-int ckmc_get_certificate_chain(const ckmc_cert_s* cert,
-                               const ckmc_cert_list_s* untrustedcerts,
-                               const ckmc_cert_list_s* trustedcerts,
-                               const bool sys_certs,
-                               ckmc_cert_list_s** ppcert_chain_list)
+int ckmc_get_cert_chain_with_trustedcert(const ckmc_cert_s* cert,
+                                         const ckmc_cert_list_s* untrustedcerts,
+                                         const ckmc_cert_list_s* trustedcerts,
+                                         const bool sys_certs,
+                                         ckmc_cert_list_s** ppcert_chain_list)
 {
     int ret;
     CKM::ManagerShPtr mgr = CKM::Manager::create();
@@ -730,11 +722,11 @@ int ckmc_get_certificate_chain(const ckmc_cert_s* cert,
 }
 
 KEY_MANAGER_CAPI
-int ckmc_get_certificate_chain_with_alias(const ckmc_cert_s* cert,
-                                          const ckmc_alias_list_s* untrustedcerts,
-                                          const ckmc_alias_list_s* trustedcerts,
-                                          const bool sys_certs,
-                                          ckmc_cert_list_s** ppcert_chain_list)
+int  ckmc_get_cert_chain_with_trustedcert_alias(const ckmc_cert_s* cert,
+                                                const ckmc_alias_list_s* untrustedcerts,
+                                                const ckmc_alias_list_s* trustedcerts,
+                                                const bool sys_certs,
+                                                ckmc_cert_list_s** ppcert_chain_list)
 {
     int ret;
     CKM::ManagerShPtr mgr = CKM::Manager::create();
@@ -776,18 +768,7 @@ int ckmc_ocsp_check(const ckmc_cert_list_s *pcert_chain_list, ckmc_ocsp_status_e
     int ret = CKMC_ERROR_UNKNOWN;
     int tmpOcspStatus = -1;
     CKM::ManagerShPtr mgr = CKM::Manager::create();
-    CKM::CertificateShPtrVector ckmCertChain;
-    const ckmc_cert_list_s *current = NULL;
-    const ckmc_cert_list_s *next = pcert_chain_list;
-
-    do {
-        current = next;
-        next = current->next;
-        if (current->cert == NULL)
-            continue;
-
-        ckmCertChain.push_back(_toCkmCertificate(current->cert));
-    } while (next != NULL);
+    CKM::CertificateShPtrVector ckmCertChain = _toCkmCertificateVector(pcert_chain_list);
 
     ret = mgr->ocspCheck(ckmCertChain, tmpOcspStatus);
     *ocsp_status = to_ckmc_ocsp_status(tmpOcspStatus);
@@ -797,7 +778,12 @@ int ckmc_ocsp_check(const ckmc_cert_list_s *pcert_chain_list, ckmc_ocsp_status_e
 KEY_MANAGER_CAPI
 int ckmc_allow_access(const char *alias, const char *accessor, ckmc_access_right_e granted)
 {
-    return ckmc_set_permission(alias, accessor, static_cast<int>(granted));
+    int ec, permissionMask;
+    ec = access_to_permission_mask(granted, permissionMask);
+    if(ec != CKMC_ERROR_NONE)
+        return ec;
+
+    return ckmc_set_permission(alias, accessor, permissionMask);
 }
 
 KEY_MANAGER_CAPI
@@ -830,3 +816,25 @@ int ckmc_remove_alias(const char *alias)
     int ret =  mgr->removeAlias(alias);
     return to_ckmc_error(ret);
 }
+
+KEY_MANAGER_CAPI
+int ckmc_encrypt_data(const ckmc_param_list_s */*params*/,
+                      const char */*key_alias*/,
+                      const char */*password*/,
+                      const ckmc_raw_buffer_s /*decrypted*/,
+                      ckmc_raw_buffer_s **/*ppencrypted*/)
+{
+    // TODO implement it
+    return CKMC_ERROR_UNKNOWN;
+}
+
+KEY_MANAGER_CAPI
+int ckmc_decrypt_data(const ckmc_param_list_s */*params*/,
+                      const char */*key_alias*/,
+                      const char */*password*/,
+                      const ckmc_raw_buffer_s /* encrypted*/,
+                      ckmc_raw_buffer_s **/*ppdecrypted*/)
+{
+    // TODO implement it
+    return CKMC_ERROR_UNKNOWN;
+}