From 6fcad713ec1ee7d40bc6f93411bb2d4c0e1dc9a8 Mon Sep 17 00:00:00 2001
From: yang1946 <yuzhaoyang1@huawei.com>
Date: Wed, 3 Jan 2024 13:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AD=BE=E5=90=8D=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yang1946 <yuzhaoyang1@huawei.com>
---
 services/key_enable/cfg/key_enable.enable_xpm.cfg |  2 +-
 utils/include/cs_hisysevent.h                     |  2 +-
 utils/include/fsverity_utils_helper.h             |  2 +-
 utils/src/code_sign_block.cpp                     | 10 ++++++++--
 utils/src/pkcs7_data.cpp                          |  4 ++--
 utils/src/signer_info.cpp                         |  2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/services/key_enable/cfg/key_enable.enable_xpm.cfg b/services/key_enable/cfg/key_enable.enable_xpm.cfg
index 6b6a6dc..ce26224 100644
--- a/services/key_enable/cfg/key_enable.enable_xpm.cfg
+++ b/services/key_enable/cfg/key_enable.enable_xpm.cfg
@@ -15,7 +15,7 @@
         }, {
             "name" : "pre-init",
             "cmds" : [
-                "write /proc/sys/kernel/xpm/xpm_mode 1",
+                "write /proc/sys/kernel/xpm/xpm_mode 1"
             ]
         }
     ],
diff --git a/utils/include/cs_hisysevent.h b/utils/include/cs_hisysevent.h
index f8da38b..b0e9485 100644
--- a/utils/include/cs_hisysevent.h
+++ b/utils/include/cs_hisysevent.h
@@ -41,7 +41,7 @@ inline void ReportInvalidCaller(const std::string &interfaceType, uint32_t token
         HiviewDFX::HiSysEvent::EventType::SECURITY,
         "INTERFACE", interfaceType, "TOKEN_ID", tokenId);
 }
-inline void ReportParseCodeSig(const std::string &fileInfo, uint32_t errCode)
+inline void ReportParseCodeSig(const std::string &fileInfo, int32_t errCode)
 {
     HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::CODE_SIGN, "CS_PARSE_CODE_SIG",
         HiviewDFX::HiSysEvent::EventType::FAULT,
diff --git a/utils/include/fsverity_utils_helper.h b/utils/include/fsverity_utils_helper.h
index 51602c3..b55b254 100644
--- a/utils/include/fsverity_utils_helper.h
+++ b/utils/include/fsverity_utils_helper.h
@@ -104,7 +104,7 @@ private:
                     return CS_ERR_FILE_READ;
                 }
                 buf += bytesRead;
-                count -= bytesRead;
+                count -= static_cast<size_t>(bytesRead);
             }
             return CS_SUCCESS;
         }
diff --git a/utils/src/code_sign_block.cpp b/utils/src/code_sign_block.cpp
index 887169f..bb3942f 100644
--- a/utils/src/code_sign_block.cpp
+++ b/utils/src/code_sign_block.cpp
@@ -34,7 +34,13 @@ namespace CodeSign {
 constexpr uint32_t HAP_CODE_SIGN_BLOCK_ID = 0x30000001;
 constexpr uint32_t CSB_PROPERTY_BLOB = 0x20000003;
 
-CodeSignBlock::CodeSignBlock() { }
+CodeSignBlock::CodeSignBlock()
+{
+    signatureInfo_.hapSigningBlockOffset = 0;
+    signatureInfo_.hapCentralDirOffset = 0;
+    signatureInfo_.hapEocdOffset = 0;
+    signatureInfo_.version = 0;
+}
 
 CodeSignBlock::~CodeSignBlock() { }
 
@@ -194,7 +200,7 @@ int32_t CodeSignBlock::GetCodeSignBlockBuffer(const std::string &path, ReadBuffe
         }
 
         blobBuffer = value.optionalBlockValue.GetBufferPtr();
-        blobSize = value.optionalBlockValue.GetCapacity();
+        blobSize = static_cast<uint32_t>(value.optionalBlockValue.GetCapacity());
         break;
     }
 
diff --git a/utils/src/pkcs7_data.cpp b/utils/src/pkcs7_data.cpp
index afbfc46..4de0d56 100644
--- a/utils/src/pkcs7_data.cpp
+++ b/utils/src/pkcs7_data.cpp
@@ -43,14 +43,14 @@ PKCS7Data::~PKCS7Data()
 
 bool PKCS7Data::InitPKCS7Data(const std::vector<ByteBuffer> &certChain)
 {
-    int flags = PKCS7_BINARY | PKCS7_DETACHED | PKCS7_NOATTR | PKCS7_PARTIAL;
+    uint32_t flags = PKCS7_BINARY | PKCS7_DETACHED | PKCS7_NOATTR | PKCS7_PARTIAL;
     STACK_OF(X509) *certs = nullptr;
     if (certChain.empty()) {
         flags = flags | PKCS7_NOCERTS;
     } else {
         certs = MakeStackOfCerts(certChain);
     }
-    p7_ = PKCS7_sign(nullptr, nullptr, certs, nullptr, flags);
+    p7_ = PKCS7_sign(nullptr, nullptr, certs, nullptr, static_cast<int>(flags));
     if (p7_ == nullptr) {
         sk_X509_pop_free(certs, X509_free);
         return false;
diff --git a/utils/src/signer_info.cpp b/utils/src/signer_info.cpp
index dc08d93..ea2d00a 100644
--- a/utils/src/signer_info.cpp
+++ b/utils/src/signer_info.cpp
@@ -143,7 +143,7 @@ uint8_t *SignerInfo::GetDataToSign(uint32_t &len)
         if (itemLen < 0) {
             return nullptr;
         }
-        len = itemLen;
+        len = static_cast<uint32_t>(itemLen);
     } else {
         if (unsignedData_ == nullptr) {
             return nullptr;
-- 
Gitee