From e66d966a553701559bfa8a6b2e755aef54b94b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E6=A0=8B?= Date: Thu, 16 Jan 2025 11:25:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Signed-off-by:=20=E7=8E=8B=E4=BD=B3?= =?UTF-8?q?=E6=A0=8B=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix --- services/package/pkg_verify/pkg_verify_util.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/services/package/pkg_verify/pkg_verify_util.cpp b/services/package/pkg_verify/pkg_verify_util.cpp index 4725e1af..97ed29da 100644 --- a/services/package/pkg_verify/pkg_verify_util.cpp +++ b/services/package/pkg_verify/pkg_verify_util.cpp @@ -32,7 +32,6 @@ namespace { constexpr uint32_t ZIP_EOCD_FIXED_PART_LEN = 22; constexpr uint32_t PKG_FOOTER_SIZE = 6; constexpr uint32_t PKG_HASH_CONTENT_LEN = SHA256_DIGEST_LENGTH; -constexpr uint32_t INTERCEPT_HASH_LENGTH = 8; } int32_t PkgVerifyUtil::VerifySourceDigest(std::vector &signature, std::vector &sourceDigest, @@ -229,9 +228,7 @@ int32_t PkgVerifyUtil::HashCheck(const PkgStreamPtr srcData, const size_t dataLe if (memcmp(hash.data(), sourceDigest.data(), digestLen) != EOK) { PKG_LOGW("Failed to memcmp data."); - UPDATER_LAST_WORD(PKG_INVALID_DIGEST, - ConvertShaHex(hash).substr(0, INTERCEPT_HASH_LENGTH), - ConvertShaHex(sourceDigest).substr(0, INTERCEPT_HASH_LENGTH), fileInfo); + UPDATER_LAST_WORD(PKG_INVALID_DIGEST, hash, sourceDigest, fileInfo); return PKG_INVALID_DIGEST; } -- Gitee From f1fc9c8bd3888dd6cf9e1e7545939b59fe1b9e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E6=A0=8B?= Date: Thu, 16 Jan 2025 11:53:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Signed-off-by:=20=E7=8E=8B=E4=BD=B3?= =?UTF-8?q?=E6=A0=8B=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix --- services/package/pkg_verify/pkg_verify_util.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/package/pkg_verify/pkg_verify_util.cpp b/services/package/pkg_verify/pkg_verify_util.cpp index 97ed29da..4951f592 100644 --- a/services/package/pkg_verify/pkg_verify_util.cpp +++ b/services/package/pkg_verify/pkg_verify_util.cpp @@ -228,7 +228,8 @@ int32_t PkgVerifyUtil::HashCheck(const PkgStreamPtr srcData, const size_t dataLe if (memcmp(hash.data(), sourceDigest.data(), digestLen) != EOK) { PKG_LOGW("Failed to memcmp data."); - UPDATER_LAST_WORD(PKG_INVALID_DIGEST, hash, sourceDigest, fileInfo); + std::string hashReport = "hash is " + hash.data() + ", sourceDigest is " + sourceDigest.data(); + UPDATER_LAST_WORD(PKG_INVALID_DIGEST, hashReport, fileInfo); return PKG_INVALID_DIGEST; } -- Gitee