From: Bartlomiej Grzelewski <b.grzelewski@samsung.com>
Date: Tue, 6 Oct 2015 10:41:38 +0000 (+0200)
Subject: Remove warnings and performance problems reported by cppcheck.
X-Git-Tag: accepted/tizen/mobile/20151014.093603~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fsecurity%2Fkey-manager.git;a=commitdiff_plain;h=2bfa145a913315ec91142d21411e4328f03631cc

Remove warnings and performance problems reported by cppcheck.

Change-Id: I6c39ff383a19554da5e9f875db51864e0e5941d0
---

diff --git a/src/manager/client-capi/ckmc-manager.cpp b/src/manager/client-capi/ckmc-manager.cpp
index dd5c644..c998171 100644
--- a/src/manager/client-capi/ckmc-manager.cpp
+++ b/src/manager/client-capi/ckmc-manager.cpp
@@ -94,9 +94,8 @@ ckmc_cert_list_s *_toNewCkmCertList(const CKM::CertificateShPtrVector &certVecto
     int ret;
     ckmc_cert_list_s *start = NULL;
     ckmc_cert_list_s *plist = NULL;
-    CKM::CertificateShPtrVector::const_iterator it;
-    for(it = certVector.begin(); it != certVector.end(); it++) {
-        CKM::RawBuffer rawBuffer = (*it)->getDER();
+    for(const auto &e : certVector) {
+        CKM::RawBuffer rawBuffer = e->getDER();
         ckmc_cert_s *pcert = NULL;
         ret = ckmc_cert_new(rawBuffer.data(), rawBuffer.size(), CKMC_FORM_DER, &pcert);
         if(pcert == NULL) {
@@ -821,12 +820,11 @@ int ckmc_ocsp_check(const ckmc_cert_list_s *pcert_chain_list, ckmc_ocsp_status_e
         return CKMC_ERROR_INVALID_PARAMETER;
     }
 
-    int ret = CKMC_ERROR_UNKNOWN;
     int tmpOcspStatus = -1;
     CKM::ManagerShPtr mgr = CKM::Manager::create();
     CKM::CertificateShPtrVector ckmCertChain = _toCkmCertificateVector(pcert_chain_list);
 
-    ret = mgr->ocspCheck(ckmCertChain, tmpOcspStatus);
+    int ret = mgr->ocspCheck(ckmCertChain, tmpOcspStatus);
     *ocsp_status = to_ckmc_ocsp_status(tmpOcspStatus);
     return to_ckmc_error(ret);
 }
diff --git a/src/manager/client-capi/ckmc-type.cpp b/src/manager/client-capi/ckmc-type.cpp
index 57071f0..7ce34be 100644
--- a/src/manager/client-capi/ckmc-type.cpp
+++ b/src/manager/client-capi/ckmc-type.cpp
@@ -75,7 +75,7 @@ int ckmc_key_new(unsigned char *raw_key, size_t key_size, ckmc_key_type_e key_ty
 {
     ckmc_key_s *pkey;
 
-    if(raw_key == NULL || key_size <= 0 || ppkey == NULL) {
+    if(raw_key == NULL || key_size == 0 || ppkey == NULL) {
         return CKMC_ERROR_INVALID_PARAMETER;
     }
 
@@ -132,7 +132,7 @@ int ckmc_buffer_new(unsigned char *data, size_t size,ckmc_raw_buffer_s **ppbuffe
 {
     ckmc_raw_buffer_s *pbuff;
 
-    if(data == NULL || size <= 0 || ppbuffer == NULL) {
+    if(data == NULL || size == 0 || ppbuffer == NULL) {
         return CKMC_ERROR_INVALID_PARAMETER;
     }
 
@@ -171,7 +171,7 @@ int ckmc_cert_new(unsigned char *raw_cert, size_t cert_size, ckmc_data_format_e
 {
     ckmc_cert_s *pcert;
 
-    if(raw_cert == NULL || cert_size <= 0 || ppcert == NULL) {
+    if(raw_cert == NULL || cert_size == 0 || ppcert == NULL) {
         return CKMC_ERROR_INVALID_PARAMETER;
     }
 
diff --git a/src/manager/common/base64.cpp b/src/manager/common/base64.cpp
index f184505..ad94d4b 100644
--- a/src/manager/common/base64.cpp
+++ b/src/manager/common/base64.cpp
@@ -63,9 +63,9 @@ RawBuffer Base64Encoder::get()
         LogWarning("Not finalized");
         ThrowMsg(Exception::NotFinalized, "Not finalized");
     }
-    BUF_MEM *bptr = 0;
+    BUF_MEM *bptr = nullptr;
     BIO_get_mem_ptr(m_b64, &bptr);
-    if (bptr == 0) {
+    if (!bptr) {
         LogError("Bio internal error");
         ThrowMsg(Exception::InternalError, "Bio internal error");
     }
diff --git a/src/manager/crypto/sw-backend/internals.cpp b/src/manager/crypto/sw-backend/internals.cpp
index 3875c2b..d5dfa23 100644
--- a/src/manager/crypto/sw-backend/internals.cpp
+++ b/src/manager/crypto/sw-backend/internals.cpp
@@ -293,7 +293,7 @@ InitCipherFn selectCipher(AlgoType type, size_t key_len = 32, bool encryption =
 
 
 RawBuffer asymmetricHelper(int (*cryptoFn)(int, const unsigned char*, unsigned char*, RSA*, int),
-                           const std::string logPrefix,
+                           const std::string &logPrefix,
                            const EvpShPtr &pkey,
                            const CryptoAlgorithm &alg,
                            const RawBuffer &data)
@@ -748,16 +748,13 @@ RawBuffer sign(EVP_PKEY *pkey,
 {
     validateParams<IsSignVerify>(alg);
 
-    int rsa_padding = NOT_DEFINED;
-    const EVP_MD *md_algo = NULL;
-
     HashAlgorithm hashTmp = HashAlgorithm::NONE;
     alg.getParam(ParamName::SV_HASH_ALGO, hashTmp);
-    md_algo = getMdAlgo(hashTmp);
+    const EVP_MD *md_algo = getMdAlgo(hashTmp);
 
     RSAPaddingAlgorithm rsaPad = RSAPaddingAlgorithm::NONE;
     alg.getParam(ParamName::SV_RSA_PADDING, rsaPad);
-    rsa_padding = getRsaPadding(rsaPad);
+    int rsa_padding = getRsaPadding(rsaPad);
 
 //
 //    if((privateKey.getType() != KeyType::KEY_RSA_PRIVATE) &&
diff --git a/src/manager/service/ckm-service.cpp b/src/manager/service/ckm-service.cpp
index 132e6a8..63095bb 100644
--- a/src/manager/service/ckm-service.cpp
+++ b/src/manager/service/ckm-service.cpp
@@ -170,7 +170,6 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
     int tmpDataType = 0;
     Name name;
     Label label, accessorLabel;
-    std::string user;
 
     buffer.Deserialize(command);
     buffer.Deserialize(msgID);
diff --git a/src/manager/service/ocsp.cpp b/src/manager/service/ocsp.cpp
index 1dde8be..4172d0f 100644
--- a/src/manager/service/ocsp.cpp
+++ b/src/manager/service/ocsp.cpp
@@ -128,7 +128,7 @@ int OCSPModule::ocsp_verify(X509 *cert, X509 *issuer, STACK_OF(X509) *trustedCer
     ASN1_GENERALIZEDTIME *nextupd = NULL;
     int use_ssl = 0;
     int ocspStatus = -1;
-    int i = 0 ,tmpIdx = 0;
+    int i = 0;
     long nsec = MAX_VALIDITY_PERIOD, maxage = -1;
     char subj_buf[256];
     int reason = 0;
@@ -290,7 +290,7 @@ int OCSPModule::ocsp_verify(X509 *cert, X509 *issuer, STACK_OF(X509) *trustedCer
 
     if(trustedCerts != NULL) {
         trustedStore = X509_STORE_new();
-        for(tmpIdx=0; tmpIdx<sk_X509_num(trustedCerts); tmpIdx++) {
+        for(int tmpIdx=0; tmpIdx<sk_X509_num(trustedCerts); tmpIdx++) {
             X509_STORE_add_cert(trustedStore, sk_X509_value(trustedCerts, tmpIdx));
         }
         X509_STORE_add_cert(trustedStore, issuer);
diff --git a/tests/test_xml-parser.cpp b/tests/test_xml-parser.cpp
index 9771849..8782ae8 100644
--- a/tests/test_xml-parser.cpp
+++ b/tests/test_xml-parser.cpp
@@ -143,7 +143,7 @@ public:
     class MathHandler : public XML::Parser::ElementHandler
     {
         public:
-            MathHandler() : m_valueSet(false), m_powerFactor(1) {}
+            MathHandler() : m_valueSet(false), m_value(0), m_powerFactor(1) {}
 
             virtual void Start(const XML::Parser::Attributes &attr) {
                 const auto & it = attr.find("powerFactor");
diff --git a/tools/ckm_tool.cpp b/tools/ckm_tool.cpp
index 0af2980..ff9f6da 100644
--- a/tools/ckm_tool.cpp
+++ b/tools/ckm_tool.cpp
@@ -53,9 +53,9 @@ int main(int argc, char* argv[])
     // simple input arg parser
     for (int i=1; i<argc-1; i++)
     {
-        long int uid;
         if(!strcmp(argv[i], "-d"))
         {
+            long int uid;
             if(parseLong(argv[i+1], uid) || uid<0) {
                 cerr << "parameter error: invalid UID provided to the -d option" << endl;
                 exit(-2);