Housekeeping: KLOC warnings removed.

Change-Id: I36a972fd2e9dbd7f4e5fc11647badaf0173a425d

diff --git a/src/manager/client-async/ocsp-receiver.cpp b/src/manager/client-async/ocsp-receiver.cpp
index 933a4e3..c619394 100644 (file)
--- a/src/manager/client-async/ocsp-receiver.cpp
+++ b/src/manager/client-async/ocsp-receiver.cpp
@@ -33,7 +33,7 @@ OcspReceiver::OcspReceiver(MessageBuffer& buffer, AsyncRequest::Map& requests) :
 
 void OcspReceiver::parseResponse()
 {
-    int id, retCode, ocspStatus;
+    int id = 0, retCode = 0, ocspStatus = 0;
     m_buffer.Deserialize(id, retCode, ocspStatus);
 
     auto it = m_requests.find(id);

diff --git a/src/manager/client-async/storage-receiver.cpp b/src/manager/client-async/storage-receiver.cpp
index 40060f8..51598f9 100644 (file)
--- a/src/manager/client-async/storage-receiver.cpp
+++ b/src/manager/client-async/storage-receiver.cpp
@@ -72,7 +72,7 @@ StorageReceiver::StorageReceiver(MessageBuffer& buffer, AsyncRequest::Map& reque
 
 void StorageReceiver::parseResponse()
 {
-    int command, id;
+    int command = 0, id = 0;
     m_buffer.Deserialize(command, id);
 
     auto it = m_requests.find(id);
@@ -136,7 +136,7 @@ void StorageReceiver::parseResponse()
 void StorageReceiver::parseGetCommand()
 {
     RawBuffer rawData;
-    int dataType, retCode;
+    int dataType = 0, retCode = 0;
     m_buffer.Deserialize(retCode, dataType, rawData);
 
     // check error code
@@ -161,7 +161,7 @@ void StorageReceiver::parseGetCommand()
 
 void StorageReceiver::parseGetListCommand()
 {
-    int dataType, retCode;
+    int dataType = 0, retCode = 0;
     LabelNameVector labelNameVector;
     m_buffer.Deserialize(retCode, dataType, labelNameVector);
 
@@ -191,7 +191,7 @@ void StorageReceiver::parseGetListCommand()
 
 void StorageReceiver::parseSaveCommand()
 {
-    int dataType, retCode;
+    int dataType = 0, retCode = 0;
     m_buffer.Deserialize(retCode, dataType);
 
     // check error code
@@ -216,7 +216,7 @@ void StorageReceiver::parseSaveCommand()
 
 void StorageReceiver::parseRemoveCommand()
 {
-    int dataType, retCode;
+    int dataType = 0, retCode = 0;
     m_buffer.Deserialize(retCode, dataType);
 
     // check error code
@@ -243,7 +243,7 @@ void StorageReceiver::parseGetChainCertCommand()
 {
     CertificateShPtrVector certificateChainVector;
     RawBufferVector rawBufferVector;
-    int retCode;
+    int retCode = 0;
     m_buffer.Deserialize(retCode, rawBufferVector);
 
     // check error code
@@ -265,7 +265,7 @@ void StorageReceiver::parseGetChainCertCommand()
 
 void StorageReceiver::parseCreateSignatureCommand()
 {
-    int retCode;
+    int retCode = 0;
     RawBuffer signature;
     m_buffer.Deserialize(retCode, signature);
 
@@ -280,7 +280,7 @@ void StorageReceiver::parseCreateSignatureCommand()
 
 void StorageReceiver::parseAllowAccessCommand()
 {
-    int retCode;
+    int retCode = 0;
     m_buffer.Deserialize(retCode);
 
     // check error code
@@ -294,7 +294,7 @@ void StorageReceiver::parseAllowAccessCommand()
 
 void StorageReceiver::parseDenyAccessCommand()
 {
-    int retCode;
+    int retCode = 0;
     m_buffer.Deserialize(retCode);
 
     // check error code
@@ -308,7 +308,7 @@ void StorageReceiver::parseDenyAccessCommand()
 
 void StorageReceiver::parseRetCode(ObserverCb callback)
 {
-    int retCode;
+    int retCode = 0;
     m_buffer.Deserialize(retCode);
 
     // check error code

diff --git a/src/manager/client/client-manager-impl.cpp b/src/manager/client/client-manager-impl.cpp
index 6e75f31..2760ec4 100644 (file)
--- a/src/manager/client/client-manager-impl.cpp
+++ b/src/manager/client/client-manager-impl.cpp
@@ -223,7 +223,7 @@ int ManagerImpl::getKey(const Alias &alias, const Password &password, KeyShPtr &
 
 int ManagerImpl::getCertificate(const Alias &alias, const Password &password, CertificateShPtr &cert)
 {
-    DBDataType recvDataType;
+    DBDataType recvDataType = DBDataType::CERTIFICATE;
     RawBuffer rawData;
 
     int retCode = getBinaryData(
@@ -251,7 +251,7 @@ int ManagerImpl::getCertificate(const Alias &alias, const Password &password, Ce
 
 int ManagerImpl::getData(const Alias &alias, const Password &password, RawBuffer &rawData)
 {
-    DBDataType recvDataType;
+    DBDataType recvDataType = DBDataType::BINARY_DATA;
 
     int retCode = getBinaryData(
         alias,

diff --git a/src/manager/common/certificate-store.cpp b/src/manager/common/certificate-store.cpp
index e0b02a6..67b3768 100644 (file)
--- a/src/manager/common/certificate-store.cpp
+++ b/src/manager/common/certificate-store.cpp
@@ -108,8 +108,8 @@ int CertificateStore::verifyCertificate(
     if (result > 0) {
         STACK_OF(X509) *chain = X509_STORE_CTX_get_chain(csc);
         for (int i = 0; i < sk_X509_num(chain); ++i) {
-            X509* cert = (X509*)sk_X509_value(chain, i);
-            chainVector.push_back(CertificateImpl(cert));
+            X509* icert = (X509*)sk_X509_value(chain, i);
+            chainVector.push_back(CertificateImpl(icert));
         }
     }
 

diff --git a/src/manager/service/CryptoService.cpp b/src/manager/service/CryptoService.cpp
index 534cd64..52b7705 100644 (file)
--- a/src/manager/service/CryptoService.cpp
+++ b/src/manager/service/CryptoService.cpp
@@ -879,9 +879,9 @@ std::vector<X509 *> CryptoService::verifyCertChain(X509 *cert,
 
     if(verified == OPENSSL_SUCCESS) {
         STACK_OF(X509) *chain = X509_STORE_CTX_get1_chain(ctx);
-        X509 *cert;
-        while((cert = sk_X509_pop(chain))) {
-            certChain.insert(certChain.begin(),cert);
+        X509 *icert;
+        while((icert = sk_X509_pop(chain))) {
+            certChain.insert(certChain.begin(),icert);
         }
     }
 

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index 09ace81..c611ee6 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -268,20 +268,20 @@ int CKMLogic::saveDataHelper(
     auto &handler = m_userDataMap[cred.uid];
     DBCrypto::Transaction transaction(&handler.database);
     if (!handler.crypto.haveKey(cred.smackLabel)) {
-        RawBuffer key;
+        RawBuffer got_key;
         auto key_optional = handler.database.getKey(cred.smackLabel);
         if(!key_optional) {
             LogDebug("No Key in database found. Generating new one for label: "
                     << cred.smackLabel);
-            key = handler.keyProvider.generateDEK(cred.smackLabel);
-            handler.database.saveKey(cred.smackLabel, key);
+            got_key = handler.keyProvider.generateDEK(cred.smackLabel);
+            handler.database.saveKey(cred.smackLabel, got_key);
         } else {
             LogDebug("Key from DB");
-            key = *key_optional;
+            got_key = *key_optional;
         }
 
-        key = handler.keyProvider.getPureDEK(key);
-        handler.crypto.pushKey(cred.smackLabel, key);
+        got_key = handler.keyProvider.getPureDEK(got_key);
+        handler.crypto.pushKey(cred.smackLabel, got_key);
     }
 
     // Do not encrypt data with password during cc_mode on

diff --git a/src/manager/service/ckm-service.cpp b/src/manager/service/ckm-service.cpp
index fcbb9d3..adbe447 100644 (file)
--- a/src/manager/service/ckm-service.cpp
+++ b/src/manager/service/ckm-service.cpp
@@ -106,8 +106,8 @@ bool CKMService::processOne(
 }
 
 RawBuffer CKMService::processControl(MessageBuffer &buffer) {
-    int command;
-    uid_t user;
+    int command = 0;
+    uid_t user = 0;
     ControlCommand cc;
     Password newPass, oldPass;
     Label smackLabel;
@@ -144,7 +144,7 @@ RawBuffer CKMService::processControl(MessageBuffer &buffer) {
         Name name;
         Label ownerLabel;
         Label accessorLabel;
-        int accessorRights;
+        int accessorRights = 0;
 
         buffer.Deserialize(user, ownerLabel, name, accessorLabel, accessorRights);
         Credentials cred = { user, ownerLabel };
@@ -178,9 +178,9 @@ RawBuffer CKMService::processControl(MessageBuffer &buffer) {
 
 RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
 {
-    int command;
-    int msgID;
-    int tmpDataType;
+    int command = 0;
+    int msgID = 0;
+    int tmpDataType = 0;
     Name name;
     Label label;
     std::string user;
@@ -246,7 +246,7 @@ RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
         case LogicCommand::CREATE_KEY_PAIR_DSA:
         case LogicCommand::CREATE_KEY_PAIR_ECDSA:
         {
-            int additional_param;
+            int additional_param = 0;
             Name privateKeyName;
             Name publicKeyName;
             PolicySerializable policyPrivateKey;
@@ -292,7 +292,7 @@ RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
         {
             Password password;        // password for private_key
             RawBuffer message;
-            int padding, hash;
+            int padding = 0, hash = 0;
             buffer.Deserialize(name, label, password, message, hash, padding);
             return m_logic->createSignature(
                   cred,
@@ -311,7 +311,7 @@ RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
             RawBuffer signature;
             //HashAlgorithm hash;
             //RSAPaddingAlgorithm padding;
-            int padding, hash;
+            int padding = 0, hash = 0;
             buffer.Deserialize(name,
                                label,
                                password,
@@ -332,7 +332,7 @@ RawBuffer CKMService::processStorage(Credentials &cred, MessageBuffer &buffer)
         }
         case LogicCommand::ALLOW_ACCESS:
         {
-            int reqRights;
+            int reqRights = 0;
             buffer.Deserialize(name, label, reqRights);
             return m_logic->allowAccess(
                 cred,

diff --git a/src/manager/service/ocsp-service.cpp b/src/manager/service/ocsp-service.cpp
index da0229a..9e8c2f6 100644 (file)
--- a/src/manager/service/ocsp-service.cpp
+++ b/src/manager/service/ocsp-service.cpp
@@ -82,7 +82,7 @@ bool OCSPService::processOne(
 
         auto &buffer = info.buffer;
 
-        int commandId;
+        int commandId = 0;
         RawBufferVector chainVector;
         buffer.Deserialize(commandId, chainVector);