AES: add generation, save, get support.

[platform/core/security/key-manager.git] / src / manager / service / ckm-service.cpp

diff --git a/src/manager/service/ckm-service.cpp b/src/manager/service/ckm-service.cpp
index 9617b79..235fe47 100644 (file)
--- a/src/manager/service/ckm-service.cpp
+++ b/src/manager/service/ckm-service.cpp
@@ -19,10 +19,7 @@
  * @version     1.0
  * @brief       CKM service implementation.
  */
-#include <service-thread.h>
-#include <generic-socket-manager.h>
-#include <connection-info.h>
-#include <message-buffer.h>
+
 #include <protocols.h>
 
 #include <dpl/serialization.h>
@@ -54,25 +51,7 @@ GenericSocketService::ServiceDescriptionVector CKMService::GetServiceDescription
     };
 }
 
-void CKMService::accept(const AcceptEvent &event) {
-    LogDebug("Accept event");
-    auto &info = m_connectionInfoMap[event.connectionID.counter];
-    info.interfaceID = event.interfaceID;
-    info.credentials = event.credentials;
-}
-
-void CKMService::write(const WriteEvent &event) {
-    LogDebug("Write event (" << event.size << " bytes)");
-}
-
-void CKMService::process(const ReadEvent &event) {
-    LogDebug("Read event");
-    auto &info = m_connectionInfoMap[event.connectionID.counter];
-    info.buffer.Push(event.rawBuffer);
-    while(processOne(event.connectionID, info));
-}
-
-bool CKMService::processOne(
+bool CKMService::ProcessOne(
     const ConnectionID &conn,
     ConnectionInfo &info)
 {
@@ -84,9 +63,9 @@ bool CKMService::processOne(
             return false;
 
         if (info.interfaceID == SOCKET_ID_CONTROL)
-            response = processControl(info.buffer);
+            response = ProcessControl(info.buffer);
         else
-            response = processStorage(info.credentials, info.buffer);
+            response = ProcessStorage(info.credentials, info.buffer);
 
         m_serviceManager->Write(conn, response);
 
@@ -109,7 +88,7 @@ bool CKMService::processOne(
     return false;
 }
 
-RawBuffer CKMService::processControl(MessageBuffer &buffer) {
+RawBuffer CKMService::ProcessControl(MessageBuffer &buffer) {
     int command = 0;
     uid_t user = 0;
     ControlCommand cc;
@@ -151,7 +130,8 @@ RawBuffer CKMService::processControl(MessageBuffer &buffer) {
         PermissionMask permissionMask = 0;
 
         buffer.Deserialize(user, name, label, accessorLabel, permissionMask);
-        Credentials cred = { user, label };
+
+        Credentials cred(user, label);
         return m_logic->setPermission(
             cred,
             command,
@@ -166,7 +146,7 @@ RawBuffer CKMService::processControl(MessageBuffer &buffer) {
     }
 }
 
-RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
+RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
 {
     int command = 0;
     int msgID = 0;
@@ -178,14 +158,6 @@ RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
     buffer.Deserialize(command);
     buffer.Deserialize(msgID);
 
-    // This is a workaround solution for locktype=None in Tizen 2.2.1
-    // When locktype is None, lockscreen app doesn't interfere with unlocking process.
-    // Therefor lockscreen app cannot notify unlock events to key-manager when locktype is None.
-    // So, to unlock user data when lock type is None, key-manager always try to unlock user data with null password.
-    // Even if the result is fail, it will be ignored.
-    Password nullPassword("");
-    m_logic->unlockUserKey(cred.uid, nullPassword, false);
-
     LogDebug("Process storage. Command: " << command);
 
     switch(static_cast<LogicCommand>(command)) {
@@ -241,12 +213,19 @@ RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
         }
         case LogicCommand::GET_PKCS12:
         {
-            buffer.Deserialize(name, label);
+            Password passKey;
+            Password passCert;
+            buffer.Deserialize(name,
+                               label,
+                               passKey,
+                               passCert);
             return m_logic->getPKCS12(
                 cred,
                 msgID,
                 name,
-                label);
+                label,
+                passKey,
+                passCert);
         }
         case LogicCommand::GET_LIST:
         {
@@ -256,18 +235,34 @@ RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
                 msgID,
                 DataType(tmpDataType));
         }
-        case LogicCommand::CREATE_KEY_PAIR_RSA:
-        case LogicCommand::CREATE_KEY_PAIR_DSA:
-        case LogicCommand::CREATE_KEY_PAIR_ECDSA:
+        case LogicCommand::CREATE_KEY_AES:
+        {
+            int size = 0;
+            Name keyName;
+            Label keyLabel;
+            PolicySerializable policyKey;
+            buffer.Deserialize(size,
+                               policyKey,
+                               keyName,
+                               keyLabel);
+            return m_logic->createKeyAES(
+                cred,
+                msgID,
+                size,
+                keyName,
+                keyLabel,
+                policyKey);
+        }
+        case LogicCommand::CREATE_KEY_PAIR:
         {
-            int additional_param = 0;
+            CryptoAlgorithmSerializable keyGenAlgorithm;
             Name privateKeyName;
             Label privateKeyLabel;
             Name publicKeyName;
             Label publicKeyLabel;
             PolicySerializable policyPrivateKey;
             PolicySerializable policyPublicKey;
-            buffer.Deserialize(additional_param,
+            buffer.Deserialize(keyGenAlgorithm,
                                policyPrivateKey,
                                policyPublicKey,
                                privateKeyName,
@@ -276,9 +271,8 @@ RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
                                publicKeyLabel);
             return m_logic->createKeyPair(
                 cred,
-                static_cast<LogicCommand>(command),
                 msgID,
-                additional_param,
+                keyGenAlgorithm,
                 privateKeyName,
                 privateKeyLabel,
                 publicKeyName,
@@ -376,11 +370,5 @@ RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
     }
 }
 
-
-void CKMService::close(const CloseEvent &event) {
-    LogDebug("Close event");
-    m_connectionInfoMap.erase(event.connectionID.counter);
-}
-
 } // namespace CKM