Fix build/syntax error

Change-Id: I7eb326ad5b1f9eb9f5aca60d682c46035d89c067

diff --git a/src/kse-backend/ksebackendcontext.cpp b/src/kse-backend/ksebackendcontext.cpp
index dd9a890cbf00b3404e7bef0fadbc850579afd220..d95fe7f872a243fb26e1658e0098f37a0aad44dd 100644 (file)
--- a/src/kse-backend/ksebackendcontext.cpp
+++ b/src/kse-backend/ksebackendcontext.cpp
@@ -1,6 +1,6 @@
 /******************************************************************
  *
- * Copyright 2019 Samsung Electronics All Rights Reserved.
+ * Copyright 2019-2020 Samsung Electronics All Rights Reserved.
  *
  * Author: Dongsun Lee <ds73.lee@samsung.com>
  *
@@ -61,7 +61,7 @@ kse_backend_context::~kse_backend_context()
 
 int kse_backend_context::get_certificate(unsigned int index, std::string& outcert)
 {
-       hal_data cert = {0};
+       hal_data cert = {NULL, 0, NULL};
        const char *method_name = "hal_get_certificate";
 
        auto backend = fBackendPtr.lock();
@@ -125,12 +125,12 @@ int kse_backend_context::request_certificate_chain(std::string& mutable_chain)
                return error;
 
        x509_crt_rewriter cert_writer;
-       if((error = cert_writer.parse(reinterpret_cast<const unsigned char *>(leaf_cert.c_str())),
-                       leaf_cert.length()+1)) {
+       if((error = cert_writer.parse(reinterpret_cast<const unsigned char *>(leaf_cert.c_str()),
+                       leaf_cert.length()+1))) {
                return error;
        }
-       if((error = cert_writer.parse(reinterpret_cast<const unsigned char *>(subca_cert.c_str())),
-                       subca_cert.length()+1)) {
+       if((error = cert_writer.parse(reinterpret_cast<const unsigned char *>(subca_cert.c_str()),
+                       subca_cert.length()+1))) {
                return error;
        }
        cert_writer.sort_chain();
@@ -157,7 +157,7 @@ hal_hash_type _get_hal_hash_type(MessageDigestType digestType) {
        case MD_MD2:
        case MD_MD4:
        case MD_RIPEMD160:
-       defalut:                return HAL_HASH_UNKNOWN;
+       default:                return HAL_HASH_UNKNOWN;
        }
 }
 
@@ -165,8 +165,8 @@ int kse_backend_context::sign_crypto_data(MessageDigestType digestType, const st
                std::string& digestResult)
 {
        BOOST_LOG_FUNCTION();
-       hal_data hashed_data = {0};
-       hal_data signed_data = {0};
+       hal_data hashed_data = {NULL, 0, NULL};
+       hal_data signed_data = {NULL, 0, NULL};
 
        hashed_data.data = (void *)dataToSign.c_str();
        hashed_data.data_len = dataToSign.size();

diff --git a/src/kse-backend/tools/konaise_tool.cpp b/src/kse-backend/tools/konaise_tool.cpp
index 8fde08a78c2d7b5d03dfc85ff7d73c07fbd3150c..222c12c29c3a1200dc3d4c17c2dbdb4e6d10d4b6 100644 (file)
--- a/src/kse-backend/tools/konaise_tool.cpp
+++ b/src/kse-backend/tools/konaise_tool.cpp
@@ -1,6 +1,6 @@
 /******************************************************************
  *
- * Copyright 2019 Samsung Electronics All Rights Reserved.
+ * Copyright 2019-2020 Samsung Electronics All Rights Reserved.
  *
  * Author: Dongsun Lee <ds73.lee@samsung.com>
  *
@@ -51,7 +51,7 @@ public:
        }
 
        void get_cert(int idx, const std::string& fileName){
-               hal_data cert = {0};
+               hal_data cert = {NULL, 0, NULL};
 
                const char *method_name = "hal_get_certificate";
                int error = fSoResolver.invoke<int, unsigned int, hal_data *>(&kse_cert_get,
@@ -65,7 +65,7 @@ public:
        }
 
        void get_key(hal_key_type key_type, int idx, const std::string& fileName) {
-               hal_data data = {0};
+               hal_data data = {NULL, 0, NULL};
                const char *method_name = "hal_get_key";
                int error = fSoResolver.invoke<int, hal_key_type, unsigned int, hal_data *>(&kse_key_get,
                                                                method_name, key_type, idx, &data);
@@ -131,7 +131,7 @@ public:
 
        void ec_sec_p256r1_sign(std::string hash_file, int key_idx, std::string sig_file) {
                hal_data *hashed_data = read_file(hash_file);
-               hal_data signed_data = {0};
+               hal_data signed_data = {NULL, 0, NULL};
                const char *method_name = "hal_ecdsa_sign_md";
                hal_ecdsa_mode mode = {HAL_ECDSA_SEC_P256R1, HAL_HASH_SHA256};
                int error = fSoResolver.invoke<int, hal_data *,
@@ -310,7 +310,7 @@ int main(int argc, char ** argv)
                        print_usage(argv[0]);
                        return -1;
                }
-       catch (...) {
+       } catch (...) {
                std::cout << "EXCEPTION OCCURRED!!" << std::endl;
                return -1;
        }