diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/entity/HwSignHead.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/entity/HwSignHead.java index 0010344c927ed9dbf85d413939d0629074dce365..24874b33faaf66741277440fb67d9703f4140d30 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/entity/HwSignHead.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/entity/HwSignHead.java @@ -90,16 +90,16 @@ public class HwSignHead { */ public byte[] getSignHeadLittleEndian(int subBlockSize, int subBlockNum) { ByteBuffer bf = ByteBuffer.allocate(SIGN_HEAD_LEN).order(ByteOrder.LITTLE_ENDIAN); - for (char c : ELF_MAGIC) { - bf.put((byte) c); + for (char character : ELF_MAGIC) { + bf.put((byte) character); } - for (char c : VERSION) { - bf.put((byte) c); + for (char character : VERSION) { + bf.put((byte) character); } bf.putInt(subBlockSize); bf.putInt(subBlockNum); - for (char c : reserve) { - bf.put((byte) c); + for (char character : reserve) { + bf.put((byte) character); } return bf.array(); } diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/provider/SignProvider.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/provider/SignProvider.java index 4e22f8145df2efc97f4d47fdb6cad06d4d79849b..b5271155cf183532ecb50aeb25472e7543bdae06 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/provider/SignProvider.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/provider/SignProvider.java @@ -84,6 +84,9 @@ import java.util.TimeZone; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; +import static com.ohos.hapsigntool.codesigning.sign.CodeSigning.SUPPORT_BIN_FILE_FORM; +import static com.ohos.hapsigntool.codesigning.sign.CodeSigning.SUPPORT_FILE_FORM; + /** * Sign provider super class * @@ -381,6 +384,10 @@ public abstract class SignProvider { private void appendCodeSignBlock(SignerConfig signerConfig, File tmpOutput, String suffix, long centralDirectoryOffset) throws FsVerityDigestException, CodeSignException, IOException, HapFormatException { + if (!SUPPORT_BIN_FILE_FORM.contains(suffix) && !SUPPORT_FILE_FORM.contains(suffix)) { + LOGGER.warn("no need to sign code for: " + suffix); + return; + } if (signParams.get(ParamConstants.PARAM_SIGN_CODE) .equals(ParamConstants.SignCodeFlag.ENABLE_SIGN_CODE.getSignCodeFlag())) { // 4 means hap format occupy 4 byte storage location,2 means optional blocks reserve 2 storage location @@ -492,8 +499,8 @@ public abstract class SignProvider { private void copyFileAndAlignment(File input, File tmpOutput, int alignment) throws IOException, HapFormatException { try (JarFile inputJar = new JarFile(input, false); - FileOutputStream outputFile = new FileOutputStream(tmpOutput); - JarOutputStream outputJar = new JarOutputStream(outputFile)) { + FileOutputStream outputFile = new FileOutputStream(tmpOutput); + JarOutputStream outputJar = new JarOutputStream(outputFile)) { long timestamp = TIMESTAMP; timestamp -= TimeZone.getDefault().getOffset(timestamp); outputJar.setLevel(COMPRESSION_MODE); diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/sign/SignElf.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/sign/SignElf.java index 811f123979a0a54e032a06aa8187381b7675e999..5c5950ef8a186de2c11815d50295bf0b25ebfaec 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/sign/SignElf.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/sign/SignElf.java @@ -128,7 +128,7 @@ public class SignElf { private static boolean writeSignedElf(String inputFile, List signBlockList, String outputFile) { try (FileOutputStream fileOutputStream = new FileOutputStream(outputFile); - DataOutputStream dataOutputStream = new DataOutputStream(fileOutputStream)) { + DataOutputStream dataOutputStream = new DataOutputStream(fileOutputStream)) { // 1. write the input file to the output file. if (!FileUtils.writeFileToDos(inputFile, dataOutputStream)) { LOGGER.error("Failed to write information of input file: " + inputFile diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/HapUtils.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/HapUtils.java index 172f8a75789ce473b2aa459476b2d4cef5f80169..09fc1c11025ec581de61cf4f5238c2fb82048b2e 100644 --- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/HapUtils.java +++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/HapUtils.java @@ -235,7 +235,7 @@ public class HapUtils { */ public static byte[] readFileToByte(String file) throws IOException { try (FileInputStream in = new FileInputStream(file); - ByteArrayOutputStream out = new ByteArrayOutputStream(in.available());) { + ByteArrayOutputStream out = new ByteArrayOutputStream(in.available());) { byte[] buf = new byte[BUFFER_LENGTH]; int len = 0; while ((len = in.read(buf)) != -1) {