Enable -Wshadow and fix warnings

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

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index 98619e0..f57f920 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -823,13 +823,13 @@ RawBuffer CKMLogic::getData(
 
        int retCode = tryRet([&] {
                Crypto::GObjUPtr obj;
-               int retCode = readDataHelper(true, cred, dataType, name, owner,
-                                                                        password, obj, objDataType);
+               int retCode2 = readDataHelper(true, cred, dataType, name, owner,
+                                                                         password, obj, objDataType);
 
-               if (retCode == CKM_API_SUCCESS)
+               if (retCode2 == CKM_API_SUCCESS)
                        rowData = obj->getBinary();
 
-               return retCode;
+               return retCode2;
        });
 
        if (CKM_API_SUCCESS != retCode)
@@ -879,36 +879,36 @@ RawBuffer CKMLogic::getPKCS12(
 
                // read private key (mandatory)
                Crypto::GObjUPtr keyObj;
-               int retCode = readDataHelper(true, cred, DataType::DB_KEY_FIRST, name, owner,
-                                                                        keyPassword, keyObj);
+               int retCode2 = readDataHelper(true, cred, DataType::DB_KEY_FIRST, name, owner,
+                                                                         keyPassword, keyObj);
 
-               if (retCode != CKM_API_SUCCESS) {
-                       if (retCode != CKM_API_ERROR_NOT_EXPORTABLE)
-                               return retCode;
+               if (retCode2 != CKM_API_SUCCESS) {
+                       if (retCode2 != CKM_API_ERROR_NOT_EXPORTABLE)
+                               return retCode2;
                } else {
                        privKey = CKM::Key::create(keyObj->getBinary());
                }
 
                // read certificate (mandatory)
                Crypto::GObjUPtr certObj;
-               retCode = readDataHelper(true, cred, DataType::CERTIFICATE, name, owner,
-                                                                certPassword, certObj);
+               retCode2 = readDataHelper(true, cred, DataType::CERTIFICATE, name, owner,
+                                                                 certPassword, certObj);
 
-               if (retCode != CKM_API_SUCCESS) {
-                       if (retCode != CKM_API_ERROR_NOT_EXPORTABLE)
-                               return retCode;
+               if (retCode2 != CKM_API_SUCCESS) {
+                       if (retCode2 != CKM_API_ERROR_NOT_EXPORTABLE)
+                               return retCode2;
                } else {
                        cert = CKM::Certificate::create(certObj->getBinary(), DataFormat::FORM_DER);
                }
 
                // read CA cert chain (optional)
                Crypto::GObjUPtrVector caChainObjs;
-               retCode = readDataHelper(true, cred, DataType::DB_CHAIN_FIRST, name, owner,
-                                                                certPassword, caChainObjs);
+               retCode2 = readDataHelper(true, cred, DataType::DB_CHAIN_FIRST, name, owner,
+                                                                 certPassword, caChainObjs);
 
-               if (retCode != CKM_API_SUCCESS && retCode != CKM_API_ERROR_DB_ALIAS_UNKNOWN) {
-                       if (retCode != CKM_API_ERROR_NOT_EXPORTABLE)
-                               return retCode;
+               if (retCode2 != CKM_API_SUCCESS && retCode2 != CKM_API_ERROR_DB_ALIAS_UNKNOWN) {
+                       if (retCode2 != CKM_API_ERROR_NOT_EXPORTABLE)
+                               return retCode2;
                } else {
                        for (auto &caCertObj : caChainObjs)
                                caChain.push_back(CKM::Certificate::create(caCertObj->getBinary(),
@@ -917,11 +917,11 @@ RawBuffer CKMLogic::getPKCS12(
 
                // if anything found, return it
                if (privKey || cert || caChain.size() > 0)
-                       retCode = CKM_API_SUCCESS;
+                       retCode2 = CKM_API_SUCCESS;
 
                // prepare response
-               if (retCode != CKM_API_SUCCESS)
-                       return retCode;
+               if (retCode2 != CKM_API_SUCCESS)
+                       return retCode2;
 
                output = PKCS12Serializable(std::move(privKey), std::move(cert), std::move(caChain));
                return CKM_API_SUCCESS;
@@ -1200,9 +1200,9 @@ RawBuffer CKMLogic::createKeyAES(
 
        try {
                retCode = tryRet([&] {
-                       auto [dbOp, digest, retCode] = beginSaveAndGetHash(cred, name, owner);
-                       if (retCode != CKM_API_SUCCESS)
-                               return retCode;
+                       auto [dbOp, digest, retCode2] = beginSaveAndGetHash(cred, name, owner);
+                       if (retCode2 != CKM_API_SUCCESS)
+                               return retCode2;
 
                        // create key in store
                        CryptoAlgorithm keyGenAlgorithm;
@@ -1433,13 +1433,13 @@ RawBuffer CKMLogic::createSignature(
        try {
                retCode = tryRet([&] {
                        Crypto::GObjUPtr obj;
-                       int retCode = readDataHelper(false, cred, DataType::DB_KEY_FIRST, privateKeyName,
-                                                                                owner, password, obj);
+                       int retCode2 = readDataHelper(false, cred, DataType::DB_KEY_FIRST, privateKeyName,
+                                                                                 owner, password, obj);
 
-                       if (retCode == CKM_API_SUCCESS)
+                       if (retCode2 == CKM_API_SUCCESS)
                                signature = obj->sign(cryptoAlg, message);
 
-                       return retCode;
+                       return retCode2;
                });
        } catch (const std::exception &e) {
                LogError("STD exception " << e.what());
@@ -1628,19 +1628,19 @@ RawBuffer CKMLogic::exportWrappedKey(
        RawBuffer wrappedKey;
 
        auto retCode = tryRet([&] {
-               auto retCode = readDataHelper(false, cred, DataType::DB_KEY_FIRST, wrappingKeyName,
-                                                                         wrappingKeyOwner, wrappingKeyPassword, wrappingKey);
-               if (retCode != CKM_API_SUCCESS)
-                       return retCode;
+               auto retCode2 = readDataHelper(false, cred, DataType::DB_KEY_FIRST, wrappingKeyName,
+                                                                          wrappingKeyOwner, wrappingKeyPassword, wrappingKey);
+               if (retCode2 != CKM_API_SUCCESS)
+                       return retCode2;
 
-               retCode = readRowHelper(false, cred, DataType::DB_KEY_FIRST, keyName,
-                                                               keyOwner, keyPassword, wrappedKeyRow, wrappedKeyType);
-               if (retCode != CKM_API_SUCCESS)
-                       return retCode;
+               retCode2 = readRowHelper(false, cred, DataType::DB_KEY_FIRST, keyName,
+                                                                keyOwner, keyPassword, wrappedKeyRow, wrappedKeyType);
+               if (retCode2 != CKM_API_SUCCESS)
+                       return retCode2;
 
                wrappedKey = wrappingKey->wrap(params, wrappedKeyRow, keyPassword);
 
-               return retCode;
+               return retCode2;
        });
 
        return SerializeMessage(msgID, retCode, wrappedKeyType, wrappedKey);