Don't return command in client-server communication

Client already has an id of the message sent to the server. There's no
point in returning the command from server and checking in on the
client's side.

* Stop returning command from server.
* Stop receiving and checking the command in the client.
* Unify naming.

Change-Id: I74bde065c5edcf414820b9c398d18e6bc0d299dd

diff --git a/src/manager/client-async/async-request.cpp b/src/manager/client-async/async-request.cpp
index ba885d8..b55bb6c 100644 (file)
--- a/src/manager/client-async/async-request.cpp
+++ b/src/manager/client-async/async-request.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,12 +27,14 @@ namespace CKM {
 AsyncRequest::AsyncRequest(const ManagerAsync::ObserverPtr &o,
                                                   std::string &&i,
                                                   RawBuffer &&b,
-                                                  int id) :
+                                                  int id,
+                                                  int command) :
        observer(o),
        interface(std::move(i)),
        buffer(std::move(b)),
        written(0),
-       id(id)
+       id(id),
+       command(command)
 {
 }
 

diff --git a/src/manager/client-async/async-request.h b/src/manager/client-async/async-request.h
index 68f1336..4c601c8 100644 (file)
--- a/src/manager/client-async/async-request.h
+++ b/src/manager/client-async/async-request.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -37,13 +37,15 @@ struct AsyncRequest {
        AsyncRequest(const ManagerAsync::ObserverPtr &observer,
                                 std::string &&interface,
                                 RawBuffer &&buffer,
-                                int id);
+                                int id,
+                                int command);
 
        ManagerAsync::ObserverPtr observer;
        std::string interface;
        RawBuffer buffer;
        size_t written;
        int id;
+       int command;
 };
 
 } /* namespace CKM */

diff --git a/src/manager/client-async/client-manager-async-impl.cpp b/src/manager/client-async/client-manager-async-impl.cpp
index 74f14f9..b02106e 100644 (file)
--- a/src/manager/client-async/client-manager-async-impl.cpp
+++ b/src/manager/client-async/client-manager-async-impl.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -255,7 +255,7 @@ void ManagerAsync::Impl::ocspCheck(const ObserverPtr &observer,
                auto send = MessageBuffer::Serialize(m_counter, rawCertChain);
 
                thread()->sendMessage(AsyncRequest(observer, SERVICE_SOCKET_OCSP, send.Pop(),
-                                                                                  m_counter));
+                                                                                  m_counter, 0));
        }, [&observer](int error) {
                observer->ReceivedError(error);
        });
@@ -401,12 +401,13 @@ void ManagerAsync::Impl::crypt(
                CryptoAlgorithmSerializable cas(algo);
                m_counter++;
 
-               auto send = MessageBuffer::Serialize(static_cast<int>(encryption ?
-                                                                                        EncryptionCommand::ENCRYPT : EncryptionCommand::DECRYPT), m_counter, cas,
+               auto command = static_cast<int>(encryption ?
+                       EncryptionCommand::ENCRYPT : EncryptionCommand::DECRYPT);
+               auto send = MessageBuffer::Serialize(command, m_counter, cas,
                                                                                         helper.getName(), helper.getOwner(), password, input);
 
                thread()->sendMessage(AsyncRequest(observer, SERVICE_SOCKET_ENCRYPTION,
-                                                                                  send.Pop(), m_counter));
+                                                                                  send.Pop(), m_counter, command));
        }, [&observer](int error) {
                observer->ReceivedError(error);
        });

diff --git a/src/manager/client-async/client-manager-async-impl.h b/src/manager/client-async/client-manager-async-impl.h
index 96c1051..6fca459 100644 (file)
--- a/src/manager/client-async/client-manager-async-impl.h
+++ b/src/manager/client-async/client-manager-async-impl.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -155,15 +155,17 @@ public:
 private:
        template <typename... Args>
        void sendToStorage(const ManagerAsync::ObserverPtr &observer,
+                          int command,
                                           const Args &... args)
        {
                m_counter++; // yes, it changes m_counter argument passed in args
 
-               auto send = MessageBuffer::Serialize(args...);
+               auto send = MessageBuffer::Serialize(command, args...);
                thread()->sendMessage(AsyncRequest(observer,
                                                                                   SERVICE_SOCKET_CKM_STORAGE,
                                                                                   send.Pop(),
-                                                                                  m_counter));
+                                                                                  m_counter,
+                                                                                  command));
        }
 
        typedef std::unique_ptr<ConnectionThread> ConnectionThreadPtr;

diff --git a/src/manager/client-async/encryption-receiver.cpp b/src/manager/client-async/encryption-receiver.cpp
index 89d1e13..33ac6c3 100644 (file)
--- a/src/manager/client-async/encryption-receiver.cpp
+++ b/src/manager/client-async/encryption-receiver.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2015 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ void EncryptionReceiver::processResponse()
        int id = 0;
        int retCode;
        RawBuffer output;
-       m_buffer.Deserialize(command, id, retCode, output);
+       m_buffer.Deserialize(id, retCode, output);
 
        auto it = m_requests.find(id);
 
@@ -51,7 +51,7 @@ void EncryptionReceiver::processResponse()
        AsyncRequest req = std::move(m_requests.at(id));
        m_requests.erase(id);
 
-       switch (static_cast<EncryptionCommand>(command)) {
+       switch (static_cast<EncryptionCommand>(req.command)) {
        case EncryptionCommand::ENCRYPT:
                if (retCode == CKM_API_SUCCESS)
                        req.observer->ReceivedEncrypted(std::move(output));

diff --git a/src/manager/client-async/storage-receiver.cpp b/src/manager/client-async/storage-receiver.cpp
index 9dd95a8..4888cdc 100644 (file)
--- a/src/manager/client-async/storage-receiver.cpp
+++ b/src/manager/client-async/storage-receiver.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -39,8 +39,8 @@ StorageReceiver::StorageReceiver(MessageBuffer &buffer,
 
 void StorageReceiver::processResponse()
 {
-       int command = 0, id = 0;
-       m_buffer.Deserialize(command, id);
+       int id = 0;
+       m_buffer.Deserialize(id);
 
        auto it = m_requests.find(id);
 
@@ -55,7 +55,7 @@ void StorageReceiver::processResponse()
 
        m_observer = req.observer;
 
-       switch (static_cast<LogicCommand>(command)) {
+       switch (static_cast<LogicCommand>(req.command)) {
        case LogicCommand::GET:
                parseGetCommand();
                break;
@@ -106,8 +106,8 @@ void StorageReceiver::processResponse()
                break;
 
        default:
-               LogError("Unknown command id: " << command);
-               ThrowMsg(BadResponse, "Unknown command id: " << command);
+               LogError("Unknown command id: " << req.command);
+               ThrowMsg(BadResponse, "Unknown command id: " << req.command);
                break;
        }
 }

diff --git a/src/manager/client/client-control.cpp b/src/manager/client/client-control.cpp
index 6ccd9e9..ed59582 100644 (file)
--- a/src/manager/client/client-control.cpp
+++ b/src/manager/client/client-control.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000-2019 Samsung Electronics Co., Ltd. All rights reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd. All rights reserved
  *
  *  Contact: Dongsun Lee <ds73.lee@samsung.com>
  *
@@ -226,9 +226,8 @@ public:
                if (CKM_API_SUCCESS != retCode)
                        return retCode;
 
-               int command;
                int counter;
-               recv.Deserialize(command, counter, retCode);
+               recv.Deserialize(counter, retCode);
 
                return retCode;
 

diff --git a/src/manager/client/client-manager-impl.cpp b/src/manager/client/client-manager-impl.cpp
index 6afc377..0728c62 100644 (file)
--- a/src/manager/client/client-manager-impl.cpp
+++ b/src/manager/client/client-manager-impl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000 - 2019 Samsung Electronics Co., Ltd All Rights Reserved
+/* Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ template <class T>
 int getCertChain(
        ServiceConnection &serviceConnection,
        LogicCommand command,
-       int counter,
+       int msgId,
        const CertificateShPtr &certificate,
        const T &untrustedVector,
        const T &trustedVector,
@@ -51,7 +51,7 @@ int getCertChain(
 
        MessageBuffer recv;
        auto send = MessageBuffer::Serialize(static_cast<int>(command),
-                                                                                counter,
+                                                                                msgId,
                                                                                 certificate->getDER(),
                                                                                 untrustedVector,
                                                                                 trustedVector,
@@ -62,12 +62,11 @@ int getCertChain(
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int retCommand;
-       int retCounter;
+       int retMsgId;
        RawBufferVector rawBufferVector;
-       recv.Deserialize(retCommand, retCounter, retCode, rawBufferVector);
+       recv.Deserialize(retMsgId, retCode, rawBufferVector);
 
-       if ((counter != retCounter) || (static_cast<int>(command) != retCommand))
+       if (msgId != retMsgId)
                return CKM_API_ERROR_UNKNOWN;
 
        if (retCode != CKM_API_SUCCESS)
@@ -105,7 +104,7 @@ int Manager::Impl::saveBinaryData(
        const RawBuffer &rawData,
        const Policy &policy)
 {
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
@@ -115,7 +114,7 @@ int Manager::Impl::saveBinaryData(
        MessageBuffer recv;
        AliasSupport helper(alias);
        auto send = MessageBuffer::Serialize(static_cast<int>(LogicCommand::SAVE),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 static_cast<int>(dataType),
                                                                                 helper.getName(),
                                                                                 helper.getOwner(),
@@ -127,12 +126,11 @@ int Manager::Impl::saveBinaryData(
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
+       int retMsgId;
        int opType;
-       recv.Deserialize(command, counter, retCode, opType);
+       recv.Deserialize(retMsgId, retCode, opType);
 
-       if (counter != my_counter)
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -184,7 +182,7 @@ int Manager::Impl::savePKCS12(
        if (alias.empty() || pkcs.get() == NULL)
                return CKM_API_ERROR_INPUT_PARAM;
 
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
@@ -192,7 +190,7 @@ int Manager::Impl::savePKCS12(
        AliasSupport helper(alias);
        auto send = MessageBuffer::Serialize(static_cast<int>
                                                                                 (LogicCommand::SAVE_PKCS12),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 helper.getName(),
                                                                                 helper.getOwner(),
                                                                                 PKCS12Serializable(*pkcs.get()),
@@ -204,11 +202,10 @@ int Manager::Impl::savePKCS12(
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
-       recv.Deserialize(command, counter, retCode);
+       int retMsgId;
+       recv.Deserialize(retMsgId, retCode);
 
-       if (counter != my_counter)
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -227,14 +224,14 @@ int Manager::Impl::getPKCS12(const Alias &alias, const Password &keyPass,
        if (alias.empty())
                return CKM_API_ERROR_INPUT_PARAM;
 
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
        MessageBuffer recv;
        AliasSupport helper(alias);
        auto send = MessageBuffer::Serialize(static_cast<int>(LogicCommand::GET_PKCS12),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 helper.getName(),
                                                                                 helper.getOwner(),
                                                                                 keyPass,
@@ -245,12 +242,11 @@ int Manager::Impl::getPKCS12(const Alias &alias, const Password &keyPass,
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
+       int retMsgId;
        PKCS12Serializable gotPkcs;
-       recv.Deserialize(command, counter, retCode, gotPkcs);
+       recv.Deserialize(retMsgId, retCode, gotPkcs);
 
-       if (counter != my_counter)
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        pkcs = std::make_shared<PKCS12Impl>(std::move(gotPkcs));
@@ -266,14 +262,14 @@ int Manager::Impl::removeAlias(const Alias &alias)
        if (alias.empty())
                return CKM_API_ERROR_INPUT_PARAM;
 
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
        MessageBuffer recv;
        AliasSupport helper(alias);
        auto send = MessageBuffer::Serialize(static_cast<int>(LogicCommand::REMOVE),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 helper.getName(),
                                                                                 helper.getOwner());
 
@@ -282,11 +278,10 @@ int Manager::Impl::removeAlias(const Alias &alias)
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
-       recv.Deserialize(command, counter, retCode);
+       int retMsgId;
+       recv.Deserialize(retMsgId, retCode);
 
-       if (counter != my_counter)
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -304,14 +299,14 @@ int Manager::Impl::getBinaryData(
        if (alias.empty())
                return CKM_API_ERROR_INPUT_PARAM;
 
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
        MessageBuffer recv;
        AliasSupport helper(alias);
        auto send = MessageBuffer::Serialize(static_cast<int>(LogicCommand::GET),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 static_cast<int>(sendDataType),
                                                                                 helper.getName(),
                                                                                 helper.getOwner(),
@@ -322,13 +317,12 @@ int Manager::Impl::getBinaryData(
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
+       int retMsgId;
        int tmpDataType;
-       recv.Deserialize(command, counter, retCode, tmpDataType, rawData);
+       recv.Deserialize(retMsgId, retCode, tmpDataType, rawData);
        recvDataType = DataType(tmpDataType);
 
-       if (counter != my_counter)
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -343,14 +337,14 @@ int Manager::Impl::getBinaryDataEncryptionStatus(const DataType sendDataType,
        if (alias.empty())
                return CKM_API_ERROR_INPUT_PARAM;
 
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
        MessageBuffer recv;
        AliasSupport helper(alias);
        auto send = MessageBuffer::Serialize(static_cast<int>(LogicCommand::GET_PROTECTION_STATUS),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 static_cast<int>(sendDataType),
                                                                                 helper.getName(),
                                                                                 helper.getOwner());
@@ -360,13 +354,12 @@ int Manager::Impl::getBinaryDataEncryptionStatus(const DataType sendDataType,
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
+       int retMsgId;
        int tmpDataType;
        bool passwordProtectionStatus;
-       recv.Deserialize(command, counter, retCode, tmpDataType, passwordProtectionStatus);
+       recv.Deserialize(retMsgId, retCode, tmpDataType, passwordProtectionStatus);
 
-       if (counter != my_counter)
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        if (retCode != CKM_API_SUCCESS) {
@@ -464,11 +457,11 @@ int Manager::Impl::getData(const Alias &alias, const Password &password,
 int Manager::Impl::getBinaryDataAliasVectorHelper(DataType dataType,
                OwnerNameVector &ownerNameVector)
 {
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        MessageBuffer recv;
        auto send = MessageBuffer::Serialize(static_cast<int>(LogicCommand::GET_LIST),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 static_cast<int>(dataType));
 
        int retCode = m_storageConnection.processRequest(send.Pop(), recv);
@@ -476,14 +469,11 @@ int Manager::Impl::getBinaryDataAliasVectorHelper(DataType dataType,
        if (retCode != CKM_API_SUCCESS)
                return retCode;
 
-       int command;
-       int counter;
+       int retMsgId;
        int tmpDataType;
+       recv.Deserialize(retMsgId, retCode, tmpDataType, ownerNameVector);
 
-       recv.Deserialize(command, counter, retCode, tmpDataType, ownerNameVector);
-
-       if ((command != static_cast<int>(LogicCommand::GET_LIST)) ||
-                       (counter != my_counter))
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return CKM_API_SUCCESS;
@@ -619,7 +609,7 @@ int Manager::Impl::createKeyAES(
        const Policy &policyKey)
 {
        // proceed with sending request
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
@@ -627,7 +617,7 @@ int Manager::Impl::createKeyAES(
        AliasSupport aliasHelper(keyAlias);
        auto send = MessageBuffer::Serialize(static_cast<int>
                                                                                 (LogicCommand::CREATE_KEY_AES),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 static_cast<int>(size),
                                                                                 PolicySerializable(policyKey),
                                                                                 aliasHelper.getName(),
@@ -638,11 +628,10 @@ int Manager::Impl::createKeyAES(
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
-       recv.Deserialize(command, counter, retCode);
+       int retMsgId;
+       recv.Deserialize(retMsgId, retCode);
 
-       if (counter != my_counter)
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -686,7 +675,7 @@ int Manager::Impl::createKeyPair(
        }
 
        // proceed with sending request
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
@@ -695,7 +684,7 @@ int Manager::Impl::createKeyPair(
        AliasSupport publicHelper(publicKeyAlias);
        auto send = MessageBuffer::Serialize(static_cast<int>
                                                                                 (LogicCommand::CREATE_KEY_PAIR),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 CryptoAlgorithmSerializable(keyGenAlgorithm),
                                                                                 PolicySerializable(policyPrivateKey),
                                                                                 PolicySerializable(policyPublicKey),
@@ -709,11 +698,10 @@ int Manager::Impl::createKeyPair(
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
-       recv.Deserialize(command, counter, retCode);
+       int retMsgId;
+       recv.Deserialize(retMsgId, retCode);
 
-       if (counter != my_counter)
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -798,7 +786,7 @@ int Manager::Impl::createSignature(
        const CryptoAlgorithm &cAlgorithm,
        RawBuffer &signature)
 {
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
@@ -806,7 +794,7 @@ int Manager::Impl::createSignature(
        AliasSupport helper(privateKeyAlias);
        auto send = MessageBuffer::Serialize(static_cast<int>
                                                                                 (LogicCommand::CREATE_SIGNATURE),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 helper.getName(),
                                                                                 helper.getOwner(),
                                                                                 password,
@@ -818,12 +806,10 @@ int Manager::Impl::createSignature(
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
-       recv.Deserialize(command, counter, retCode, signature);
+       int retMsgId;
+       recv.Deserialize(retMsgId, retCode, signature);
 
-       if ((command != static_cast<int>(LogicCommand::CREATE_SIGNATURE))
-                       || (counter != my_counter))
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -838,7 +824,7 @@ int Manager::Impl::verifySignature(
        const RawBuffer &signature,
        const CryptoAlgorithm &cAlg)
 {
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
@@ -846,7 +832,7 @@ int Manager::Impl::verifySignature(
        AliasSupport helper(publicKeyOrCertAlias);
        auto send = MessageBuffer::Serialize(static_cast<int>
                                                                                 (LogicCommand::VERIFY_SIGNATURE),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 helper.getName(),
                                                                                 helper.getOwner(),
                                                                                 password,
@@ -859,12 +845,10 @@ int Manager::Impl::verifySignature(
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
-       recv.Deserialize(command, counter, retCode);
+       int retMsgId;
+       recv.Deserialize(retMsgId, retCode);
 
-       if ((command != static_cast<int>(LogicCommand::VERIFY_SIGNATURE))
-                       || (counter != my_counter))
+       if (retMsgId != msgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -877,7 +861,7 @@ int Manager::Impl::ocspCheck(const CertificateShPtrVector &certChain,
 {
        EXCEPTION_GUARD_START_CPPAPI
 
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
        MessageBuffer recv;
 
        RawBufferVector rawCertChain;
@@ -891,17 +875,17 @@ int Manager::Impl::ocspCheck(const CertificateShPtrVector &certChain,
                rawCertChain.push_back(e->getDER());
        }
 
-       auto send = MessageBuffer::Serialize(my_counter, rawCertChain);
+       auto send = MessageBuffer::Serialize(msgId, rawCertChain);
 
        int retCode = m_ocspConnection.processRequest(send.Pop(), recv);
 
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int counter;
-       recv.Deserialize(counter, retCode, ocspStatus);
+       int retMsgId;
+       recv.Deserialize(retMsgId, retCode, ocspStatus);
 
-       if (my_counter != counter)
+       if (msgId != retMsgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -913,7 +897,7 @@ int Manager::Impl::setPermission(const Alias &alias,
                                                                 const ClientId &accessor,
                                                                 PermissionMask permissionMask)
 {
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
@@ -921,7 +905,7 @@ int Manager::Impl::setPermission(const Alias &alias,
        AliasSupport helper(alias);
        auto send = MessageBuffer::Serialize(static_cast<int>
                                                                                 (LogicCommand::SET_PERMISSION),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 helper.getName(),
                                                                                 helper.getOwner(),
                                                                                 accessor,
@@ -932,11 +916,10 @@ int Manager::Impl::setPermission(const Alias &alias,
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int command;
-       int counter;
-       recv.Deserialize(command, counter, retCode);
+       int retMsgId;
+       recv.Deserialize(retMsgId, retCode);
 
-       if (my_counter != counter)
+       if (msgId != retMsgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;
@@ -951,7 +934,7 @@ int Manager::Impl::crypt(EncryptionCommand command,
                                                 const RawBuffer &input,
                                                 RawBuffer &output)
 {
-       int my_counter = ++m_counter;
+       int msgId = ++m_counter;
 
        EXCEPTION_GUARD_START_CPPAPI
 
@@ -959,7 +942,7 @@ int Manager::Impl::crypt(EncryptionCommand command,
        AliasSupport helper(keyAlias);
        CryptoAlgorithmSerializable cas(algo);
        auto send = MessageBuffer::Serialize(static_cast<int>(command),
-                                                                                my_counter,
+                                                                                msgId,
                                                                                 cas,
                                                                                 helper.getName(),
                                                                                 helper.getOwner(),
@@ -971,11 +954,10 @@ int Manager::Impl::crypt(EncryptionCommand command,
        if (CKM_API_SUCCESS != retCode)
                return retCode;
 
-       int retCommand;
-       int counter;
-       recv.Deserialize(retCommand, counter, retCode, output);
+       int retMsgId;
+       recv.Deserialize(retMsgId, retCode, output);
 
-       if (my_counter != counter || retCommand != static_cast<int>(command))
+       if (msgId != retMsgId)
                return CKM_API_ERROR_UNKNOWN;
 
        return retCode;

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index c26dc6a..3f0387b 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -516,17 +516,14 @@ int CKMLogic::getKeyForService(
 
 RawBuffer CKMLogic::saveData(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        const Name &name,
        const ClientId &explicitOwner,
        const Crypto::Data &data,
        const PolicySerializable &policy)
 {
        int retCode = verifyAndSaveDataHelper(cred, name, explicitOwner, data, policy);
-       auto response = MessageBuffer::Serialize(static_cast<int>(LogicCommand::SAVE),
-                                       commandId,
-                                       retCode,
-                                       static_cast<int>(data.type));
+       auto response = MessageBuffer::Serialize(msgId, retCode, static_cast<int>(data.type));
        return response.Pop();
 }
 
@@ -593,7 +590,7 @@ int CKMLogic::extractPKCS12Data(
 
 RawBuffer CKMLogic::savePKCS12(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        const Name &name,
        const ClientId &explicitOwner,
        const PKCS12Serializable &pkcs,
@@ -611,10 +608,7 @@ RawBuffer CKMLogic::savePKCS12(
                retCode = CKM_API_ERROR_SERVER_ERROR;
        }
 
-       auto response = MessageBuffer::Serialize(static_cast<int>
-                                       (LogicCommand::SAVE_PKCS12),
-                                       commandId,
-                                       retCode);
+       auto response = MessageBuffer::Serialize(msgId, retCode);
        return response.Pop();
 }
 
@@ -682,7 +676,7 @@ int CKMLogic::removeDataHelper(
 
 RawBuffer CKMLogic::removeData(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        const Name &name,
        const ClientId &explicitOwner)
 {
@@ -697,9 +691,7 @@ RawBuffer CKMLogic::removeData(
                retCode = CKM_API_ERROR_DB_ERROR;
        }
 
-       auto response = MessageBuffer::Serialize(static_cast<int>(LogicCommand::REMOVE),
-                                       commandId,
-                                       retCode);
+       auto response = MessageBuffer::Serialize(msgId, retCode);
        return response.Pop();
 }
 
@@ -946,7 +938,7 @@ int CKMLogic::readDataHelper(
 
 RawBuffer CKMLogic::getData(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        DataType dataType,
        const Name &name,
        const ClientId &explicitOwner,
@@ -973,17 +965,16 @@ RawBuffer CKMLogic::getData(
        if (CKM_API_SUCCESS != retCode)
                rowData.clear();
 
-       auto response = MessageBuffer::Serialize(static_cast<int>(LogicCommand::GET),
-                                       commandId,
-                                       retCode,
-                                       static_cast<int>(objDataType),
-                                       rowData);
+       auto response = MessageBuffer::Serialize(msgId,
+                                                retCode,
+                                                static_cast<int>(objDataType),
+                                                rowData);
        return response.Pop();
 }
 
 RawBuffer CKMLogic::getDataProtectionStatus(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                DataType dataType,
                const Name &name,
                const ClientId &explicitOwner)
@@ -1010,11 +1001,10 @@ RawBuffer CKMLogic::getDataProtectionStatus(
                retCode = CKM_API_SUCCESS;
        }
 
-       auto response = MessageBuffer::Serialize(static_cast<int>(LogicCommand::GET_PROTECTION_STATUS),
-                                       commandId,
-                                       retCode,
-                                       static_cast<int>(objDataType),
-                                       status);
+       auto response = MessageBuffer::Serialize(msgId,
+                                                retCode,
+                                                static_cast<int>(objDataType),
+                                                status);
        return response.Pop();
 }
 
@@ -1077,7 +1067,7 @@ int CKMLogic::getPKCS12Helper(
 
 RawBuffer CKMLogic::getPKCS12(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        const Name &name,
        const ClientId &explicitOwner,
        const Password &keyPassword,
@@ -1105,11 +1095,7 @@ RawBuffer CKMLogic::getPKCS12(
                retCode = CKM_API_ERROR_SERVER_ERROR;
        }
 
-       auto response = MessageBuffer::Serialize(static_cast<int>
-                                       (LogicCommand::GET_PKCS12),
-                                       commandId,
-                                       retCode,
-                                       output);
+       auto response = MessageBuffer::Serialize(msgId, retCode, output);
        return response.Pop();
 }
 
@@ -1154,7 +1140,7 @@ int CKMLogic::getDataListHelper(const Credentials &cred,
 
 RawBuffer CKMLogic::getDataList(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        DataType dataType)
 {
        OwnerNameVector systemVector;
@@ -1194,12 +1180,10 @@ RawBuffer CKMLogic::getDataList(
                                                           userVector.end());
        }
 
-       auto response = MessageBuffer::Serialize(static_cast<int>
-                                       (LogicCommand::GET_LIST),
-                                       commandId,
-                                       retCode,
-                                       static_cast<int>(dataType),
-                                       ownerNameVector);
+       auto response = MessageBuffer::Serialize(msgId,
+                                                retCode,
+                                                static_cast<int>(dataType),
+                                                ownerNameVector);
        return response.Pop();
 }
 
@@ -1464,7 +1448,7 @@ int CKMLogic::createKeyPairHelper(
 
 RawBuffer CKMLogic::createKeyPair(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        const CryptoAlgorithmSerializable &keyGenParams,
        const Name &namePrivate,
        const ClientId &explicitOwnerPrivate,
@@ -1492,13 +1476,12 @@ RawBuffer CKMLogic::createKeyPair(
                retCode = CKM_API_ERROR_SERVER_ERROR;
        }
 
-       return MessageBuffer::Serialize(static_cast<int>(LogicCommand::CREATE_KEY_PAIR),
-                                                                       commandId, retCode).Pop();
+       return MessageBuffer::Serialize(msgId, retCode).Pop();
 }
 
 RawBuffer CKMLogic::createKeyAES(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        const int size,
        const Name &name,
        const ClientId &explicitOwner,
@@ -1518,8 +1501,7 @@ RawBuffer CKMLogic::createKeyAES(
                retCode = CKM_API_ERROR_SERVER_ERROR;
        }
 
-       return MessageBuffer::Serialize(static_cast<int>(LogicCommand::CREATE_KEY_AES),
-                                                                       commandId, retCode).Pop();
+       return MessageBuffer::Serialize(msgId, retCode).Pop();
 }
 
 int CKMLogic::readCertificateHelper(
@@ -1657,7 +1639,7 @@ int CKMLogic::getCertificateChainHelper(
 
 RawBuffer CKMLogic::getCertificateChain(
        const Credentials & /*cred*/,
-       int commandId,
+       int msgId,
        const RawBuffer &certificate,
        const RawBufferVector &untrustedCertificates,
        const RawBufferVector &trustedCertificates,
@@ -1682,17 +1664,13 @@ RawBuffer CKMLogic::getCertificateChain(
                LogError("Unknown error.");
        }
 
-       auto response = MessageBuffer::Serialize(static_cast<int>
-                                       (LogicCommand::GET_CHAIN_CERT),
-                                       commandId,
-                                       retCode,
-                                       chainRawVector);
+       auto response = MessageBuffer::Serialize(msgId, retCode, chainRawVector);
        return response.Pop();
 }
 
 RawBuffer CKMLogic::getCertificateChain(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        const RawBuffer &certificate,
        const OwnerNameVector &untrustedCertificates,
        const OwnerNameVector &trustedCertificates,
@@ -1718,17 +1696,13 @@ RawBuffer CKMLogic::getCertificateChain(
                LogError("Unknown error.");
        }
 
-       auto response = MessageBuffer::Serialize(static_cast<int>
-                                       (LogicCommand::GET_CHAIN_ALIAS),
-                                       commandId,
-                                       retCode,
-                                       chainRawVector);
+       auto response = MessageBuffer::Serialize(msgId, retCode, chainRawVector);
        return response.Pop();
 }
 
 RawBuffer CKMLogic::createSignature(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        const Name &privateKeyName,
        const ClientId &explicitOwner,
        const Password &password,           // password for private_key
@@ -1756,17 +1730,13 @@ RawBuffer CKMLogic::createSignature(
                retCode = CKM_API_ERROR_SERVER_ERROR;
        }
 
-       auto response = MessageBuffer::Serialize(static_cast<int>
-                                       (LogicCommand::CREATE_SIGNATURE),
-                                       commandId,
-                                       retCode,
-                                       signature);
+       auto response = MessageBuffer::Serialize(msgId, retCode, signature);
        return response.Pop();
 }
 
 RawBuffer CKMLogic::verifySignature(
        const Credentials &cred,
-       int commandId,
+       int msgId,
        const Name &publicKeyOrCertName,
        const ClientId &explicitOwner,
        const Password &password,           // password for public_key (optional)
@@ -1797,10 +1767,7 @@ RawBuffer CKMLogic::verifySignature(
                retCode = CKM_API_ERROR_SERVER_ERROR;
        }
 
-       auto response = MessageBuffer::Serialize(static_cast<int>
-                                       (LogicCommand::VERIFY_SIGNATURE),
-                                       commandId,
-                                       retCode);
+       auto response = MessageBuffer::Serialize(msgId, retCode);
        return response.Pop();
 }
 
@@ -1854,7 +1821,6 @@ int CKMLogic::setPermissionHelper(
 
 RawBuffer CKMLogic::setPermission(
        const Credentials &cred,
-       const int command,
        const int msgID,
        const Name &name,
        const ClientId &explicitOwner,
@@ -1872,7 +1838,7 @@ RawBuffer CKMLogic::setPermission(
                retCode = CKM_API_ERROR_DB_ERROR;
        }
 
-       return MessageBuffer::Serialize(command, msgID, retCode).Pop();
+       return MessageBuffer::Serialize(msgID, retCode).Pop();
 }
 
 int CKMLogic::loadAppKey(UserData &handle, const ClientId &owner)

diff --git a/src/manager/service/ckm-logic.h b/src/manager/service/ckm-logic.h
index 67c6519..b1c87cb 100644 (file)
--- a/src/manager/service/ckm-logic.h
+++ b/src/manager/service/ckm-logic.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014 - 2019 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ public:
 
        RawBuffer saveData(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const Name &name,
                const ClientId &explicitOwner,
                const Crypto::Data &data,
@@ -86,7 +86,7 @@ public:
 
        RawBuffer savePKCS12(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const Name &name,
                const ClientId &explicitOwner,
                const PKCS12Serializable &pkcs,
@@ -95,13 +95,13 @@ public:
 
        RawBuffer removeData(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const Name &name,
                const ClientId &explicitOwner);
 
        RawBuffer getData(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                DataType dataType,
                const Name &name,
                const ClientId &explicitOwner,
@@ -109,14 +109,14 @@ public:
 
        RawBuffer getDataProtectionStatus(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                DataType dataType,
                const Name &name,
                const ClientId &explicitOwner);
 
        RawBuffer getPKCS12(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const Name &name,
                const ClientId &explicitOwner,
                const Password &keyPassword,
@@ -124,12 +124,12 @@ public:
 
        RawBuffer getDataList(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                DataType dataType);
 
        RawBuffer createKeyPair(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const CryptoAlgorithmSerializable &keyGenParams,
                const Name &namePrivate,
                const ClientId &explicitOwnerPrivate,
@@ -140,7 +140,7 @@ public:
 
        RawBuffer createKeyAES(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const int size,
                const Name &name,
                const ClientId &explicitOwner,
@@ -148,7 +148,7 @@ public:
 
        RawBuffer getCertificateChain(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const RawBuffer &certificate,
                const RawBufferVector &untrustedCertificates,
                const RawBufferVector &trustedCertificates,
@@ -156,7 +156,7 @@ public:
 
        RawBuffer getCertificateChain(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const RawBuffer &certificate,
                const OwnerNameVector &untrustedCertificates,
                const OwnerNameVector &trustedCertificates,
@@ -164,7 +164,7 @@ public:
 
        RawBuffer  createSignature(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const Name &privateKeyName,
                const ClientId &explicitOwner,
                const Password &password,           // password for private_key
@@ -173,7 +173,7 @@ public:
 
        RawBuffer verifySignature(
                const Credentials &cred,
-               int commandId,
+               int msgId,
                const Name &publicKeyOrCertName,
                const ClientId &explicitOwner,
                const Password &password,           // password for public_key (optional)
@@ -185,7 +185,6 @@ public:
 
        RawBuffer setPermission(
                const Credentials &cred,
-               const int command,
                const int msgID,
                const Name &name,
                const ClientId &explicitOwner,

diff --git a/src/manager/service/ckm-service.cpp b/src/manager/service/ckm-service.cpp
index 7d29ca8..fd54b88 100644 (file)
--- a/src/manager/service/ckm-service.cpp
+++ b/src/manager/service/ckm-service.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2019 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -190,7 +190,6 @@ RawBuffer CKMService::ProcessControl(MessageBuffer &buffer, bool allowed)
                logicFunc = [&, name, explicitOwner, accessor, permissionMask, cred]() {
                        return m_logic->setPermission(
                                           cred,
-                                          command,
                                           0, // dummy
                                           name,
                                           explicitOwner,
@@ -215,13 +214,13 @@ RawBuffer CKMService::ProcessControl(MessageBuffer &buffer, bool allowed)
 RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
 {
        int command = 0;
-       int msgID = 0;
+       int msgId = 0;
        int tmpDataType = 0;
        Name name;
        ClientId explicitOwner, accessor;
 
        buffer.Deserialize(command);
-       buffer.Deserialize(msgID);
+       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.
@@ -240,7 +239,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                buffer.Deserialize(tmpDataType, name, explicitOwner, rawData, policy);
                return m_logic->saveData(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   name,
                                   explicitOwner,
                                   Crypto::Data(DataType(tmpDataType), std::move(rawData)),
@@ -254,7 +253,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                buffer.Deserialize(name, explicitOwner, pkcs, keyPolicy, certPolicy);
                return m_logic->savePKCS12(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   name,
                                   explicitOwner,
                                   pkcs,
@@ -266,7 +265,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                buffer.Deserialize(name, explicitOwner);
                return m_logic->removeData(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   name,
                                   explicitOwner);
        }
@@ -276,7 +275,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                buffer.Deserialize(tmpDataType, name, explicitOwner, password);
                return m_logic->getData(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   DataType(tmpDataType),
                                   name,
                                   explicitOwner,
@@ -286,14 +285,10 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
        case LogicCommand::GET_PKCS12: {
                Password passKey;
                Password passCert;
-               buffer.Deserialize(
-                       name,
-                       explicitOwner,
-                       passKey,
-                       passCert);
+               buffer.Deserialize(name, explicitOwner, passKey, passCert);
                return m_logic->getPKCS12(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   name,
                                   explicitOwner,
                                   passKey,
@@ -304,7 +299,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                buffer.Deserialize(tmpDataType, name, explicitOwner);
                return m_logic->getDataProtectionStatus(
                                        cred,
-                                       msgID,
+                                       msgId,
                                        DataType(tmpDataType),
                                        name,
                                        explicitOwner);
@@ -314,7 +309,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                buffer.Deserialize(tmpDataType);
                return m_logic->getDataList(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   DataType(tmpDataType));
        }
 
@@ -323,14 +318,10 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                Name keyName;
                ClientId keyExplicitOwner;
                PolicySerializable policyKey;
-               buffer.Deserialize(
-                       size,
-                       policyKey,
-                       keyName,
-                       keyExplicitOwner);
+               buffer.Deserialize(size, policyKey, keyName, keyExplicitOwner);
                return m_logic->createKeyAES(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   size,
                                   keyName,
                                   keyExplicitOwner,
@@ -354,7 +345,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                                                   explicitOwnerPublic);
                return m_logic->createKeyPair(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   keyGenAlgorithm,
                                   privateKeyName,
                                   explicitOwnerPrivate,
@@ -372,7 +363,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                buffer.Deserialize(certificate, untrustedVector, trustedVector, systemCerts);
                return m_logic->getCertificateChain(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   certificate,
                                   untrustedVector,
                                   trustedVector,
@@ -387,7 +378,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                buffer.Deserialize(certificate, untrustedVector, trustedVector, systemCerts);
                return m_logic->getCertificateChain(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   certificate,
                                   untrustedVector,
                                   trustedVector,
@@ -403,7 +394,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
 
                return m_logic->createSignature(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   name,
                                   explicitOwner,
                                   password,           // password for private_key
@@ -417,16 +408,11 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                RawBuffer signature;
                CryptoAlgorithmSerializable cAlg;
 
-               buffer.Deserialize(name,
-                                                  explicitOwner,
-                                                  password,
-                                                  message,
-                                                  signature,
-                                                  cAlg);
+               buffer.Deserialize(name, explicitOwner, password, message, signature, cAlg);
 
                return m_logic->verifySignature(
                                   cred,
-                                  msgID,
+                                  msgId,
                                   name,
                                   explicitOwner,
                                   password,           // password for public_key (optional)
@@ -440,8 +426,7 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                buffer.Deserialize(name, explicitOwner, accessor, permissionMask);
                return m_logic->setPermission(
                                   cred,
-                                  command,
-                                  msgID,
+                                  msgId,
                                   name,
                                   explicitOwner,
                                   accessor,

diff --git a/src/manager/service/encryption-service.cpp b/src/manager/service/encryption-service.cpp
index 5289f83..bc4aa2b 100644 (file)
--- a/src/manager/service/encryption-service.cpp
+++ b/src/manager/service/encryption-service.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2015 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -47,8 +47,7 @@ void EncryptionService::RespondToClient(const CryptoRequest &request,
                                                                                const RawBuffer &data)
 {
        try {
-               RawBuffer response = MessageBuffer::Serialize(
-                                                                static_cast<int>(request.command), request.msgId, retCode, data).Pop();
+               RawBuffer response = MessageBuffer::Serialize(request.msgId, retCode, data).Pop();
                m_serviceManager->Write(request.conn, response);
        } catch (...) {
                LogError("Failed to send response to the client");

diff --git a/src/manager/service/ocsp-logic.cpp b/src/manager/service/ocsp-logic.cpp
index fe2a8d2..9861dc0 100644 (file)
--- a/src/manager/service/ocsp-logic.cpp
+++ b/src/manager/service/ocsp-logic.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014 - 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ void OCSPLogic::setNetAvailable()
        m_isNetAvailable = false;
 }
 
-RawBuffer OCSPLogic::ocspCheck(int commandId, const RawBufferVector &rawChain,
+RawBuffer OCSPLogic::ocspCheck(int msgId, const RawBufferVector &rawChain,
                                                           bool allowed)
 {
        CertificateImplVector certChain;
@@ -113,7 +113,7 @@ RawBuffer OCSPLogic::ocspCheck(int commandId, const RawBufferVector &rawChain,
        if (retCode == CKM_API_SUCCESS)
                ocspStatus = ocsp.verify(certChain);
 
-       return MessageBuffer::Serialize(commandId, retCode, ocspStatus).Pop();
+       return MessageBuffer::Serialize(msgId, retCode, ocspStatus).Pop();
 }
 
 } // namespace CKM

diff --git a/src/manager/service/ocsp-logic.h b/src/manager/service/ocsp-logic.h
index 9357752..5c88db9 100644 (file)
--- a/src/manager/service/ocsp-logic.h
+++ b/src/manager/service/ocsp-logic.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014 - 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,8 +33,7 @@ public:
        OCSPLogic &operator=(const OCSPLogic &) = delete;
        OCSPLogic &operator=(OCSPLogic &&) = delete;
 
-       RawBuffer ocspCheck(int commandId, const RawBufferVector &rawChain,
-                                               bool allowed);
+       RawBuffer ocspCheck(int msgId, const RawBufferVector &rawChain, bool allowed);
        virtual ~OCSPLogic() {}
 
 private:

diff --git a/src/manager/service/ocsp-service.cpp b/src/manager/service/ocsp-service.cpp
index 216d336..62a0bee 100644 (file)
--- a/src/manager/service/ocsp-service.cpp
+++ b/src/manager/service/ocsp-service.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2014 - 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2014 - 2020 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -75,11 +75,11 @@ bool OCSPService::ProcessOne(
 
                auto &buffer = info.buffer;
 
-               int commandId = 0;
+               int msgId = 0;
                RawBufferVector chainVector;
-               buffer.Deserialize(commandId, chainVector);
+               buffer.Deserialize(msgId, chainVector);
 
-               RawBuffer response = m_logic->ocspCheck(commandId, chainVector, allowed);
+               RawBuffer response = m_logic->ocspCheck(msgId, chainVector, allowed);
                m_serviceManager->Write(conn, response);
 
                return true;