From 395954c3449d327741117f6709ee2e7550d9a195 Mon Sep 17 00:00:00 2001 From: zfeixiang Date: Tue, 9 Jul 2024 11:11:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E7=AD=BE=E8=A7=A3?= =?UTF-8?q?=E6=9E=90so=E7=AD=BE=E5=90=8D=E5=9D=97=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zfeixiang --- .../codesigning/datastructure/NativeLibInfoSegment.java | 2 ++ .../hapsigntool/codesigning/sign/VerifyCodeSignature.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/codesigning/datastructure/NativeLibInfoSegment.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/codesigning/datastructure/NativeLibInfoSegment.java index 8e635ac9..cc857b33 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/codesigning/datastructure/NativeLibInfoSegment.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/codesigning/datastructure/NativeLibInfoSegment.java @@ -234,6 +234,7 @@ public class NativeLibInfoSegment { for (SignedFilePos pos : inSignedFilePosList) { byte[] fileNameBuffer = new byte[pos.getFileNameSize()]; fileNameListSize += pos.getFileNameSize(); + bf.position(pos.getFileNameOffset()); bf.get(fileNameBuffer); inFileNameList.add(new String(fileNameBuffer, StandardCharsets.UTF_8)); } @@ -248,6 +249,7 @@ public class NativeLibInfoSegment { throw new VerifyCodeSignException("SignInfo not aligned in NativeLibInfoSegment"); } byte[] signInfoBuffer = new byte[pos.getSignInfoSize()]; + bf.position(pos.getSignInfoOffset()); bf.get(signInfoBuffer); inSignInfoList.add(SignInfo.fromByteArray(signInfoBuffer)); } diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/codesigning/sign/VerifyCodeSignature.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/codesigning/sign/VerifyCodeSignature.java index 4493066e..4c4a401b 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/codesigning/sign/VerifyCodeSignature.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/codesigning/sign/VerifyCodeSignature.java @@ -221,7 +221,7 @@ public class VerifyCodeSignature { hnpEntryNames.add(filePath[0]); hnpLibSignInfoMap.put(entryName, signInfo); } else { - LOGGER.debug("verify lib: {}", entryName); + LOGGER.info("verify lib: {}", entryName); verifyHapLib(inputJar, entryName, signInfo, pairResult); } } @@ -271,7 +271,7 @@ public class VerifyCodeSignature { if (!hnpLibSignInfoMap.containsKey(libPath)) { continue; } - LOGGER.debug("verify lib: {}", libPath); + LOGGER.info("verify lib: {}", libPath); SignInfo signInfo = hnpLibSignInfoMap.get(libPath); byte[] entrySig = signInfo.getSignature(); long dataSize = signInfo.getDataSize(); -- Gitee