From d2a794c319973f9138cd979603ac2310c4a52315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E6=A0=8B?= Date: Wed, 11 Dec 2024 06:06:54 +0000 Subject: [PATCH 1/2] update services/package/pkg_verify/openssl_util.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王佳栋 --- services/package/pkg_verify/openssl_util.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/package/pkg_verify/openssl_util.cpp b/services/package/pkg_verify/openssl_util.cpp index e73d4f1c..9f3d6bd7 100644 --- a/services/package/pkg_verify/openssl_util.cpp +++ b/services/package/pkg_verify/openssl_util.cpp @@ -218,11 +218,11 @@ int32_t CalcSha256Digest(const PkgStreamPtr srcData, const size_t dataLen, std:: UPDATER_LAST_WORD(-1); return -1; } - SHA256_Update(&ctx, buffer.buffer, blockLen); + SHA256_Update(&ctx, buffer.buffer, readLen); offset += readLen; remainLen -= readLen; } - if (remainLen > 0) { + while (remainLen > 0) { ret = srcData->Read(buffer, offset, remainLen, readLen); if (ret != 0) { PKG_LOGE("Fail read data"); @@ -230,6 +230,9 @@ int32_t CalcSha256Digest(const PkgStreamPtr srcData, const size_t dataLen, std:: return -1; } SHA256_Update(&ctx, buffer.buffer, readLen); + offset += readLen; + PKG_LOGE("use new remainLen"); + remainLen -= readLen; } if (SHA256_Final(result.data(), &ctx) != 1) { -- Gitee From 62e60b35d030d2380fc9fe498848bac3d6d67df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E6=A0=8B?= Date: Wed, 11 Dec 2024 06:09:21 +0000 Subject: [PATCH 2/2] update services/package/pkg_verify/openssl_util.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王佳栋 --- services/package/pkg_verify/openssl_util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/package/pkg_verify/openssl_util.cpp b/services/package/pkg_verify/openssl_util.cpp index 9f3d6bd7..a2ed3711 100644 --- a/services/package/pkg_verify/openssl_util.cpp +++ b/services/package/pkg_verify/openssl_util.cpp @@ -231,7 +231,7 @@ int32_t CalcSha256Digest(const PkgStreamPtr srcData, const size_t dataLen, std:: } SHA256_Update(&ctx, buffer.buffer, readLen); offset += readLen; - PKG_LOGE("use new remainLen"); + PKG_LOGI("use new remainLen"); remainLen -= readLen; } -- Gitee