修改测试代码
This commit is contained in:
parent
6f5279c744
commit
b075246612
@ -1,6 +1,7 @@
|
|||||||
package com.sunyard.sge.database;
|
package com.sunyard.sge.database;
|
||||||
|
|
||||||
public interface ISM3 {
|
public interface ISM3 {
|
||||||
public void update(byte[] pcData);
|
void update(byte[] pcData);
|
||||||
public byte[] digest();
|
|
||||||
|
byte[] digest();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
package com.sunyard.sge.database;
|
package com.sunyard.sge.database;
|
||||||
|
|
||||||
public interface ISM4Mac {
|
public interface ISM4Mac {
|
||||||
public void update(byte[] pcData);
|
void update(byte[] pcData);
|
||||||
public byte[] digest();
|
byte[] digest();
|
||||||
public boolean checkDigest(byte[] mac);
|
boolean checkDigest(byte[] mac);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,13 +1,9 @@
|
|||||||
package com.sunyard.sge.database;
|
package com.sunyard.sge.database;
|
||||||
|
|
||||||
import com.sun.jna.ptr.IntByReference;
|
|
||||||
import com.sunyard.SydApiException;
|
import com.sunyard.SydApiException;
|
||||||
import com.sunyard.proto.Util;
|
import com.sunyard.proto.Util;
|
||||||
import com.sunyard.sge.bytes.BytesUtil;
|
|
||||||
import com.sunyard.sge.database.pool.HsmLinkInfo;
|
import com.sunyard.sge.database.pool.HsmLinkInfo;
|
||||||
import com.sunyard.sge.log.LogFactory;
|
import com.sunyard.sge.log.LogFactory;
|
||||||
import com.sunyard.sge.plus.ConnectHandlerManager;
|
|
||||||
import com.sunyard.sge.plus.SydLibrary;
|
|
||||||
import com.sunyard.sge.pool.ObjectInPool;
|
import com.sunyard.sge.pool.ObjectInPool;
|
||||||
import com.sunyard.util.SYMUtil;
|
import com.sunyard.util.SYMUtil;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
@ -818,8 +814,7 @@ public class SydApiBaseFunction implements SydApi {
|
|||||||
}
|
}
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
synchronized (api) {
|
synchronized (api) {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
@ -874,6 +869,7 @@ public class SydApiBaseFunction implements SydApi {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 非依赖 C 实现,仅长连接依赖 C
|
* 非依赖 C 实现,仅长连接依赖 C
|
||||||
|
*
|
||||||
* @param iEncKeyIndex:输入。加密所需要的密钥索引值
|
* @param iEncKeyIndex:输入。加密所需要的密钥索引值
|
||||||
* @param iMacKeyIndex:输入。计算mac所需要的密钥索引值
|
* @param iMacKeyIndex:输入。计算mac所需要的密钥索引值
|
||||||
* @param pcData: 输入。计算mac所需要的数据。
|
* @param pcData: 输入。计算mac所需要的数据。
|
||||||
@ -893,7 +889,6 @@ public class SydApiBaseFunction implements SydApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DataAndMacCheck SYD_SM4_CheckMacAndDecrypt_ShortData(int iEncKeyIndex, int iMacKeyIndex, byte[] pcData, byte[] mac) {
|
public DataAndMacCheck SYD_SM4_CheckMacAndDecrypt_ShortData(int iEncKeyIndex, int iMacKeyIndex, byte[] pcData, byte[] mac) {
|
||||||
Logger log = LogFactory.getLogger();
|
Logger log = LogFactory.getLogger();
|
||||||
@ -997,7 +992,6 @@ public class SydApiBaseFunction implements SydApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected static int[] toIntArray(List<Integer> list) {
|
protected static int[] toIntArray(List<Integer> list) {
|
||||||
if (null == list || list.isEmpty()) {
|
if (null == list || list.isEmpty()) {
|
||||||
return new int[0];
|
return new int[0];
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user