调整接口和测试

2025-06-30 16:01:47 +08:00
parent f215651ad7
commit 9efe703bca
16 changed files with 1416 additions and 45 deletions
@@ -798,14 +798,18 @@ public class SydApiBaseFunction implements SydApi {
        return new DataAndMac(enData, mac);
    }

-    @Override
-    public byte[] SYD_SM4_CheckMacAndDecrypt_ShortData(int iEncKeyIndex, int iMacKeyIndex, byte[] pcData, String mac) {
-        boolean ret = SYD_SM4Mac_ShortData(iMacKeyIndex, pcData, mac);
-        if (!ret) {
-            throw new SydApiException("MAC 验证不通过", 90);
-        }

-        return SYD_SM4_ShortData(iEncKeyIndex, pcData, Consts.ECB_DEC);
+
+    @Override
+    public DataAndMacCheck SYD_SM4_CheckMacAndDecrypt_ShortData(int iEncKeyIndex, int iMacKeyIndex, byte[] pcData, String mac) {
+        boolean ret = SYD_SM4Mac_ShortData(iMacKeyIndex, pcData, mac);
+        byte[] data = null;
+        try {
+            data = SYD_SM4_ShortData(iEncKeyIndex, pcData, Consts.ECB_DEC);
+        }catch (Exception e){
+            return new DataAndMacCheck(null, ret);
+        }
+        return new DataAndMacCheck(data, ret);
    }

    @Override