diff --git a/doc/java 接口说明 V1.04.docx b/doc/java 接口说明 V1.04.docx index cb8dc3d..6d4fb32 100644 Binary files a/doc/java 接口说明 V1.04.docx and b/doc/java 接口说明 V1.04.docx differ diff --git a/src/test/java/test/CalcRes.java b/src/test/java/test/CalcRes.java index 6db54f2..50139b1 100644 --- a/src/test/java/test/CalcRes.java +++ b/src/test/java/test/CalcRes.java @@ -9,7 +9,7 @@ import java.util.List; public class CalcRes { public static final String SM3_SHORT_RESULT1 = "62EDD1C6C4542572F68A2A687AF44E5CD809A5A72CACAA00B07B38581F23E515"; public static final String SM3_SHORT_RESULT2 = "1AB21D8355CFA17F8E61194831E81A8F22BEC8C728FEFB747ED035EB5082AA2B"; - public static final String SM3_LONG_RESULT1 = "418EE7D57FB9944DD2EC3B1BA9656BD63B8D374F8BE9CEE4DA5D7FE057200B47"; + public static final String SM3_LONG_RESULT1 = "E0BAB8F4D8172BA245190D13C94117E93B82166C25B2B69883350C192C905140"; public static final String SM3_LONG_RESULT2 = "1AB21D8355CFA17F8E61194831E81A8F22BEC8C728FEFB747ED035EB5082AA2B"; public static final String SM4_SHORT_RESULT1 = "9602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF79602336689EBE51437A3B12B0915CFF74C72CDD5012CA05BC095A4A4F5B66F64"; public static final String SM4_SHORT_RESULT2 = "4C72CDD5012CA05BC095A4A4F5B66F64"; diff --git a/src/test/java/test/FuncTest.java b/src/test/java/test/FuncTest.java index 8e9d48b..60bb201 100644 --- a/src/test/java/test/FuncTest.java +++ b/src/test/java/test/FuncTest.java @@ -102,11 +102,21 @@ public class FuncTest { SydApi api = connect(); ISM3 sm3 = api.initSM3(); - byte[] data = new byte[4064]; - for (int i = 0; i < 10; i++) { + byte[] data = new byte[2]; + for (int i = 0; i < 16; i++) { sm3.update(data); } byte[] res1 = sm3.digest(); + if (Arrays.equals(res1, Util.hexString2Bytes(CalcRes.SM3_LONG_RESULT1)) + ) { + System.out.println("SM3长数据测试成功"); + } else { + System.out.println("SM3长数据测试失败"); + System.out.println("计算结果:" + Util.bytes2HexString(res1)); + System.out.println("预期结果:" + CalcRes.SM3_LONG_RESULT1); + } + + data = new byte[0]; sm3 = api.initSM3(); @@ -116,15 +126,12 @@ public class FuncTest { byte[] res2 = sm3.digest(); - if (Arrays.equals(res1, Util.hexString2Bytes(CalcRes.SM3_LONG_RESULT1)) - && Arrays.equals(res2, Util.hexString2Bytes(CalcRes.SM3_LONG_RESULT2)) + if (Arrays.equals(res2, Util.hexString2Bytes(CalcRes.SM3_LONG_RESULT2)) ) { System.out.println("SM3长数据测试成功"); } else { System.out.println("SM3长数据测试失败"); - System.out.println("计算结果:" + res1); - System.out.println("预期结果:" + CalcRes.SM3_LONG_RESULT1); - System.out.println("计算结果:" + res2); + System.out.println("计算结果:" + Util.bytes2HexString(res2)); System.out.println("预期结果:" + CalcRes.SM3_LONG_RESULT2); }