Sunyard/sydapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改部分xml文档，java类合并其他库中的接口

Browse Source
This commit is contained in:
zhoubin
2021-08-05 10:08:44 +08:00
parent 505f379bcf
commit 1db7955ca7
10 changed files with 911 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DProto/4D41.xml
-2
View File
@@ -34,11 +34,9 @@
<full len="1" cn="填充类型">
<text>0</text>
</full>
<macLen len="1" cn="MAC 长度标识">
<text>1</text>
</macLen>
<key cn="密钥">
DProto/4D43.xml
-2
View File
@@ -34,11 +34,9 @@
</type>
<full len="1" cn="填充类型">
<text>0</text>
</full>
<macLen len="1" cn="MAC 长度标识">
<text>1</text>
</macLen>
<key cn="密钥">
DProto/8008.xml
+116
View File
@@ -0,0 +1,116 @@
<?xml version="1.0" encoding="UTF-8" ?>
<packet extend="base">
<req>
<command>
<bin>8008</bin>
</command>
<data extend="data">
<dataFlag len="1" cn="数据包标志">
<options>
<option cn="起始包">
<bin>00</bin>
</option>
<option cn="中间包">
<bin>01</bin>
</option>
<option cn="结束包">
<bin>02</bin>
</option>
</options>
</dataFlag>
<sqlite3 cn="Sqlite3 查询条件">
若没有特别查询条件，则值为“ 1 = 1 ”
</sqlite3>
</data>
</req>
<res>
<command>
<bin>8009</bin>
</command>
<data>
<error len="2" cn="错误码" format="X" :catch="catchError('%s')">
<options>
<option cn="无错误">
<hex>00</hex>
</option>
<option cn="公钥不符合编码规则">
<hex>04</hex>
</option>
<option cn="无效的加密标识">
<hex>06</hex>
</option>
<option cn="无效的附加模式标识">
<hex>07</hex>
</option>
<option cn="密钥奇偶校验错误">
<hex>10</hex>
</option>
<option cn="LMK 错误">
LMK 错误；报告给管理员。
<hex>13</hex>
</option>
<option cn="输入数据错">
<hex>15</hex>
</option>
<option cn="DSP 错误">
DSP 错误；报告给管理员。
<hex>47</hex>
</option>
<option cn="私钥错误">
私钥错误；报告给管理员。
<hex>49</hex>
</option>
<option cn="密钥块长度错误">
<hex>76</hex>
</option>
<option cn="输入数据长度错误">
<hex>80</hex>
</option>
</options>
</error>
<dataFlag len="4" cn="数据包标志">
0：起始包
1：中间包
2：结束包
(可能hi因为字节对此，后三字节为垃圾值)
</dataFlag>
<certAllNum len="4" cn="证书总数">
主机字节序
</certAllNum>
<realCertNum len="4" cn="实际证书个数">
主机字节序
</realCertNum>
<dataAttrFlag len="4" cn="数据包属性标志">
0：固定长度包
1：变长包，用@分隔
目前默认为0，
</dataAttrFlag>
<certLenMax len="4" cn="证书最大长度">
目前固定128，若不够用，可用考虑改为256
</certLenMax>
<certDN maxLen="1280" cn="证书DN">
证书DN
</certDN>
</data>
</res>
<script><![CDATA[
function certDNLen() {
return $final.getSection('data').getLen() - 22
}
]]> </script>
</packet>
DProto/8009.xml
+96
View File
@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8" ?>
<packet extend="base">
<req>
<command>
<bin>8009</bin>
</command>
<data extend="data">
<certLen len="2" :value="certDataLen()" cn="公钥证书数据长度">
</certLen>
<certData cn="公钥证书数据">
</certData>
<organizationIdLen len="2" :value="organizationIdLen()" required="false" cn="机构号长度">
机构号长度
</organizationIdLen>
<organizationId required="false" cn="机构号">
机构号,可选
</organizationId>
</data>
</req>
<res>
<command>
<bin>800A</bin>
</command>
<data>
<error len="2" cn="错误码" format="X" :catch="catchError('%s')">
<options>
<option cn="无错误">
<hex>00</hex>
</option>
<option cn="公钥不符合编码规则">
<hex>04</hex>
</option>
<option cn="无效的加密标识">
<hex>06</hex>
</option>
<option cn="无效的附加模式标识">
<hex>07</hex>
</option>
<option cn="密钥奇偶校验错误">
<hex>10</hex>
</option>
<option cn="LMK 错误">
LMK 错误；报告给管理员。
<hex>13</hex>
</option>
<option cn="输入数据错">
<hex>15</hex>
</option>
<option cn="DSP 错误">
DSP 错误；报告给管理员。
<hex>47</hex>
</option>
<option cn="私钥错误">
私钥错误；报告给管理员。
<hex>49</hex>
</option>
<option cn="密钥块长度错误">
<hex>76</hex>
</option>
<option cn="输入数据长度错误">
<hex>80</hex>
</option>
</options>
</error>
</data>
</res>
<script><![CDATA[
function certDataLen(){
def len = $packet.data.certData.length;
def data = new byte[2];
data[0] = (byte)(len >> 8 & 0xFF)
data[1] = (byte)(len & 0xFF)
// data[0] = 0x04
// data[1] = 0xB4
return data;
}
function organizationIdLen(){
def organizationId = $packet.data.organizationId;
if(null!=organizationId){
def len = organizationId.length;
def data = new byte[2];
data[0] = (byte)(len >> 8 & 0xFF)
data[1] = (byte)(len & 0xFF)
return data;
}
}
]]> </script>
</packet>
src/main/java/com/sunyard/RetWrap.java
+198
View File
@@ -8,4 +8,202 @@ import java.util.HashMap;
*/
public class RetWrap extends HashMap<String, Object>{
public static String transMsg(int retCode){
String msg;
switch (retCode){
case -1:
case -2:
case -3:
msg = "网络错误";
break;
case -4:
msg = "返回包的序列号有误";
break;
case -5:
msg = "返回包的命令码有误";
break;
case -6:
msg = "输出缓冲区预留太小";
break;
case -25:
msg = "输入的 HASH 值长度应该为 32 个字节";
break;
case -26:
msg = "用户标识超长(应该<=16) ";
break;
case -27:
msg = "数据类型不合法 ";
break;
case 33:
msg = "检索的数据或密钥不存在 ";
break;
case 4:
msg = "DER 编码格式错误(公钥) ";
break;
case 21:
msg = "输入的数据格式错误 ";
break;
case 19:
msg = "数据解密错(C3) ";
break;
case 2:
msg = "签名验证错误 ";
break;
case 32770:
msg = "签名验证错误(P7) ";
break;
case 36868:
msg = "DN 所指向的实体不存在 ";
break;
case 32884:
msg = "证书或签名数据的格式错 ";
break;
case 36865:
msg = "不支持的命令";
break;
case 36866:
msg = "数据库操作错误";
break;
case 36867:
msg = "数据记录已经存在";
break;
case 36869:
msg = "加密卡错误";
break;
case 36870:
msg = "系统错误(加密数据)";
break;
case 36871:
msg = "CRL文件中包含的废除证书太多(系统限制200个)";
break;
case 36872:
msg = "用户证书不在此废除的证书之列";
break;
case 36874:
msg = "IC卡错误";
break;
case 36875:
msg = "IC卡口令验证错误，请重新连接";
break;
case 36876:
msg = "IC卡编号错误，请重新连接";
break;
case 36877:
msg = "IC卡角色错误，请重新连接";
break;
case 36878:
msg = "IC卡初始化错误，请重新插入";
break;
case 36879:
msg = "IC卡已初始化";
break;
case 36880:
msg = "不是空白卡";
break;
case 36881:
msg = "IC卡未初始化";
break;
case 32769:
msg = "签名出错，请核对索引号";
break;
case 32772:
msg = "证书过期";
break;
case 32773:
msg = "该证书发行者不可信";
break;
case 32774:
msg = "证书格式错";
break;
case 32775:
msg = "机构ID不合法";
break;
case 32776:
msg = "此证书属于根证书，不在用户证书管理范围";
break;
case 32777:
msg = "产生证书请求出错";
break;
case 32784:
msg = "该证书已被废弃";
break;
case 28673:
msg = "随机数的时效已过";
break;
case 28674:
msg = "登录超时";
break;
case 28675:
msg = "登录口令错";
break;
case 28677:
msg = "操作功能非法使用";
break;
case 28678:
msg = "系统已签退，请重新登录";
break;
case 28679:
msg = "操作权限限制";
break;
case 28680:
msg = "随机数据长度超过系统的要求";
break;
case 28681:
msg = "此操作员不存在";
break;
case 28688:
msg = "此操作员已经存在";
break;
case 28689:
msg = "该IP是本地IP，不能进行分发";
break;
case 24581:
msg = "文件在设备后端读写失败";
break;
case 24582:
msg = "ERROR_HANDLE_NULL";
break;
case 24585:
msg = "升级文件格式有误，请核对后再操作";
break;
case 24592:
msg = "命令执行过程中出现系统错误";
break;
case 24593:
msg = "本功能升级已经结束，不用重复操作";
break;
case 24594:
msg = "数据不合法或格式不正确";
break;
case 24595:
msg = "中心标识未设，请先设置中心标识";
break;
case 24596:
msg = "加密密钥不存在";
break;
case 24597:
msg = "密钥应用超过10个(密钥必须索引0－9）";
break;
case 24598:
msg = "行标识没有设置";
break;
case 24577:
msg = "查询类型错误";
break;
case 24578:
msg = "查询格式错误";
break;
case 24579:
msg = "数据不合法";
break;
case 24580:
msg = "系统的口令错误";
break;
default:
msg = "未定义的错误";
}
return msg;
}
}
src/main/java/com/sunyard/SydApi.java
+8
View File
@@ -20,6 +20,14 @@ public interface SydApi extends SydRawApi, SydCertApi, SydCryptionApi, SydGenApi
int NALG_SM4 = 0x01;
int NALG_AES = 0x02;
//清算总行密押MAC填充模式
byte MIYA_FULL_WEAK = 0x30;
byte MIYA_FULL_FORCE = 0x31;
//清算总行密押MAC长度标识
byte MIYA_MAC_LEN_4 = 0x31;
byte MIYA_MAC_LEN_8 = 0x32;
byte MIYA_MAC_LEN_16 = 0x33;
String RET_CIPHER_KEY = "CipherKey";
String RET_SESSION_KEY = "SessionKey";
String RET_PUBLIC_KEY = "PublicKey";
src/main/java/com/sunyard/inf/SydCertApi.java
+23
View File
@@ -1,8 +1,11 @@
package com.sunyard.inf;
import com.sunyard.RetWrap;
import com.sunyard.cert.X509;
import java.io.UnsupportedEncodingException;
/**
* 证书操作相关接口
*/
@@ -29,6 +32,11 @@ public interface SydCertApi {
byte[] dn
);
String RSAGetPublicKeyC(
String userId,
int nKeyTypes
);
/**
* 通过使用者 ID 获得使用者的 SM2 公钥(DER 编码)。
* @param userId 使用者的 ID，最大长度为 16 位数字，右对齐。
@@ -79,4 +87,19 @@ public interface SydCertApi {
String sign
);
/**
* 查询所有证书
* @param dataFlag 数据包标志 0：起始包 1：中间包 2：结束包
* @return
*/
RetWrap getAllCert(int dataFlag) throws UnsupportedEncodingException;
/**
* 上传指定证书到加密设备
* @param certData 证书的字节数组
* @param organizationId 机构号的字节数组
* @return
*/
RetWrap importCert(byte[] certData, byte[] organizationId);
}
src/main/java/com/sunyard/inf/SydCryptionApi.java
+72
View File
@@ -1,5 +1,6 @@
package com.sunyard.inf;
import com.sun.org.apache.xml.internal.security.exceptions.Base64DecodingException;
import com.sunyard.RetWrap;
/**
@@ -94,6 +95,77 @@ interface SydASYMApi {
String userId,
String pEnData
);
/**
* 使用外部私钥解密
* @param sk
* @param enData
* @return
*/
byte[] SM2Decrypt(byte[] sk, String enData);
/**
* 用指定的 RSA 私钥对指定的密文数据进行加密。
*
* @param publicKey 私钥串，DER 编码，HEX 格式。
* @param pOrgData 加密的数据。
* @return 加密的数据 base64 编码。
*/
String RSAEncrypt(
String publicKey,
byte[] pOrgData
);
/**
* 通过使用者 ID 所对应的私钥对指定的密文数据进行解密。
*
* @param userId 使用者的 ID，最大长度为 16 位数字，右对齐。
* @param pEnData 加密的数据，base64 编码。
* @return 明文数据。
*/
byte[] RSADecryptC(
String userId,
String pEnData
) throws Base64DecodingException;
/**
* 使用外部私钥解密
* @param sk
* @param enData
* @return
*/
public byte[] RSADecrypt(String sk, String enData) throws Base64DecodingException;
/**
* 非对称公钥加密
* @param alg
* @param pk
* @param data
* @return
*/
public byte[] encryptByPk(int alg, String pk, byte[] data);
/**
* 非对称私钥解密
* @param alg
* @param sk 私钥值
* @param data
* @return
*/
public byte[] decryptBySk(int alg, String sk, byte[] data);
/**
* 非对称私钥解密
* @param alg
* @param user
* @param data
* @return
*/
public byte[] decryptBySkC(int alg, String user, byte[] data);
}
src/main/java/com/sunyard/inf/SydPledge.java
+27 -2
View File
@@ -10,7 +10,19 @@ public interface SydPledge {
* @param Data 原始数据
* @return MAC 长度为 8 的 HEX字符串
*/
public String GenerateMIYA(String AreaCode, int Version, int Alg, byte[] Data);
String GenerateMIYA(String AreaCode, int Version, int Alg, byte[] Data);
/**
*
* @param AreaCode 地区代码 6 位
* @param Version 版本号
* @param Alg SydApi.NALG_3DES/SydApi.NALG_SM4
* @param Data 原始数据
* @param fullFlag 填充类型
* @param macLenFlag MAC 长度标识
* @return
*/
String GenerateMIYA(String AreaCode, int Version, int Alg, byte[] Data, byte fullFlag, byte macLenFlag);
/**
*
@@ -21,6 +33,19 @@ public interface SydPledge {
* @param Data 原始数据
* @return true=核押通过 false=核押不通过
*/
public boolean VerifyMIYA(String AreaCode, int Version, int Alg, String MAC, byte[] Data);
boolean VerifyMIYA(String AreaCode, int Version, int Alg, String MAC, byte[] Data);
/**
*
* @param AreaCode 地区代码 6 位
* @param Version 版本号
* @param Alg SydApi.NALG_3DES/SydApi.NALG_SM4
* @param mac 长度为 8 的 HEX字符串
* @param Data 原始数据
* @param fullFlag 填充类型
* @param macLenFlag MAC 长度标识
* @return
*/
boolean VerifyMIYA(String AreaCode, int Version, int Alg, String mac, byte[] Data, byte fullFlag, byte macLenFlag);
}
src/main/java/racal/sunyard/main/SydApi4j.java
+371 -60
View File
@@ -535,6 +535,7 @@ public class SydApi4j implements SydApi {
}
@Override
public RetWrap genComposeKey(String keyType, char keySolution, String keyClearPattern) {
ProtoAA proto = new ProtoAA();
@@ -825,6 +826,127 @@ public class SydApi4j implements SydApi {
return GetX509CertInfo(new String(pCertInfo));
}
@Override
public RetWrap getAllCert(int dataFlag) throws UnsupportedEncodingException {
Proto8008 proto = new Proto8008();
// 填充数据
HashMap<String, Object> packet = new HashMap<String, Object>();
HashMap<String, Object> data = new HashMap<String, Object>();
packet.put("data", data);
PacketSN sn = PacketSN.gen();
packet.put("header", sn.getSn().array());
data.put("dataFlag$option", dataFlag);
String sqlite3 = "1 = 1 ";
data.put("sqlite3", sqlite3);
// 渲染发送
ByteBuffer bb = proto.rend(packet);
synchronized (this) {
// 响应解析
bb = syncRead(syncSend(bb));
}
Packet p = proto.parse(bb, packet);
Map<String, Object> ret = p.toMap();
if (
!Arrays.equals(sn.getSn().array(), ((PacketSection) ret.get("header")).getBytes())
) {
throw new SydApiException("包序号不匹配", -4);
}
ret = (Map<String, Object>) ret.get("data");
PacketSection error = (PacketSection) ret.get("error");
byte[] be = error.getBytes();
if ( ( 0 != (be[0] ^ be[1]))) {
throw new SydApiException(error.getInfo(), error.autoInt());
}
RetWrap r = new RetWrap();
PacketSection resDataFlag = (PacketSection) ret.get("dataFlag");
r.put("dataFlag", (int) resDataFlag.getBytes()[0]);
PacketSection certAllNum = (PacketSection) ret.get("certAllNum");
r.put("certAllNum", (int) certAllNum.getBytes()[0]);
PacketSection realCertNum = (PacketSection) ret.get("realCertNum");
r.put("realCertNum", (int) realCertNum.getBytes()[0]);
PacketSection dataAttrFlag = (PacketSection) ret.get("dataAttrFlag");
r.put("dataAttrFlag", (int) dataAttrFlag.getBytes()[0]);
r.put("certLenMax", Integer.parseInt(Util.bytes2HexString(Util.toArray(bb)).substring(60, 62), 16));
List<String> certs = new ArrayList<String>();
while( bb.limit() - bb.position() >= 128 ) {
byte[] cert = new byte[ 128 ];
bb.get( cert );
certs.add( new String(cert, "GBK") );
}
r.put("certDNs", certs.toArray(new String[0]));
return r;
}
@Override
public RetWrap importCert(byte[] certData, byte[] organizationId) {
Proto8009 proto = new Proto8009();
// 填充数据
HashMap<String, Object> packet = new HashMap<String, Object>();
HashMap<String, Object> data = new HashMap<String, Object>();
packet.put("data", data);
PacketSN sn = PacketSN.gen();
packet.put("header", sn.getSn().array());
data.put("certData", certData );
if(null != organizationId && organizationId.length > 0){
data.put("organizationId", organizationId );
}
// int length = certData.length;
// System.out.println("dataLength: " + length);
// 渲染发送
ByteBuffer bb = proto.rend(packet);
// String s = Util.bytes2HexString(Util.toArray(bb));
// System.out.println(s);
synchronized (this) {
// 响应解析
bb = syncRead(syncSend(bb));
}
Packet p = proto.parse(bb, packet);
Map<String, Object> ret = p.toMap();
if (
!Arrays.equals(sn.getSn().array(), ((PacketSection) ret.get("header")).getBytes())
) {
throw new SydApiException("包序号不匹配", -4);
}
ret = (Map<String, Object>) ret.get("data");
PacketSection error = (PacketSection) ret.get("error");
byte[] be = error.getBytes();
// String s1 = Util.bytes2HexString(be);
// System.out.println(s1);
RetWrap r = new RetWrap();
r.put("retCode", true);
if ( ( 0 != (be[0] ^ be[1]))) {
r.put("retCode", false);
r.put("msg", error.getInfo() == null || "".equals(error.getInfo()) ? RetWrap.transMsg(error.autoInt()) : error.getInfo());
}
return r;
}
public SydApi4j() {
// if (null == pset) {
@@ -1146,7 +1268,7 @@ public class SydApi4j implements SydApi {
}
private byte[] repackEncrypt(HashMap<String, Object> packet) {
private byte[] repackEncrypt(HashMap<String, Object> packet) {
HashMap<String, Object> data = (HashMap<String, Object>) packet.get("data");
int v = ((byte[]) data.get("msg")).length;
@@ -1155,7 +1277,7 @@ public class SydApi4j implements SydApi {
repack("E0", 2048, packet, new PackCallBack() {
@Override
public void circle(int packSn, HashMap<String, Object> packet, Map<String, Object> ret) {
public void circle(int packSn, HashMap<String, Object> packet, Map<String, Object> ret) {
bbs.put(((PacketSection) ret.get("msg")).getBytes());
}
@@ -1164,20 +1286,20 @@ public class SydApi4j implements SydApi {
return Util.toArray(bbs);
}
private RetWrap repackEncrypt(HashMap<String, Object> packet,Boolean isDe) {
private RetWrap repackEncrypt(HashMap<String, Object> packet, Boolean isDe) {
HashMap<String, Object> data = (HashMap<String, Object>) packet.get("data");
int v = ((byte[]) data.get("msg")).length;
final ByteBuffer bbs = ByteBuffer.allocate(v + 1024);
int packSize=2048;
int packSizeDe=packSize+16;
int packSize = 2048;
int packSizeDe = packSize + 16;
// int fm = (int) data.get("fullMode$option");
int fm = (Integer) data.get("fullMode$option");
if (isDe && 1 == fm && v<=packSizeDe && v>packSize) {
if (isDe && 1 == fm && v <= packSizeDe && v > packSize) {
//说明传入数据正好是2048,pkcs模式下机密来的,解密时需当做唯一包处理
packSize=packSizeDe;
packSize = packSizeDe;
}
RetWrap retWrap = repack("E0", packSize, packet, new PackCallBack() {
@Override
@@ -1230,9 +1352,9 @@ public class SydApi4j implements SydApi {
//>2k,即进行分块,首尾包进行解密-> 报错
//如果是PKCS模式,packSize应为2064,才能当做唯一包进行解密
int fm= (Integer) data.get("fullMode$option");
int loop=0;
int tailLen=0;
int fm = (Integer) data.get("fullMode$option");
int loop = 0;
int tailLen = 0;
//解密时,PKCS,2048<V<=2064
//先考虑2k,4k,6k
@@ -1247,10 +1369,9 @@ public class SydApi4j implements SydApi {
byte[] msgAll = (byte[]) (data.get("msg"));
// 大包分包
int block = 0;
if ( data.containsKey("block") ){
if (data.containsKey("block")) {
block = (Integer) data.get("block");
}
@@ -1265,12 +1386,11 @@ public class SydApi4j implements SydApi {
hasIV = false;
}*/
if (0 == roundModel){
if (0 == roundModel) {
hasIV = false;
}
/**
* 初始值，仅当密钥加密模式为2,3,4时有此域。
* 当密钥模式为 0,1时，该域为16H
@@ -1279,13 +1399,13 @@ public class SydApi4j implements SydApi {
int alg = (Integer) data.get("alg$option");
int ivlen = (0 == alg || 1 == alg) ? 16 : 32;
byte[] iv = (byte[]) data.get("iv");
if( null == iv || iv.length <=0){
if (null == iv || iv.length <= 0) {
iv = new byte[ivlen];
Arrays.fill(iv, (byte) 0x30);
}
data.put("iv", iv);
RetWrap retWrap=new RetWrap();
RetWrap retWrap = new RetWrap();
// 获取协议
synchronized (this) {
int packNo = 0;
@@ -1302,7 +1422,7 @@ public class SydApi4j implements SydApi {
// 唯一包
// [如果大包是中间包 2，则全部是中间包]
packNo = 0;
if( 2 == block){
if (2 == block) {
packNo = 2;
}
@@ -1313,13 +1433,13 @@ public class SydApi4j implements SydApi {
// 首包
packNo = 1;
// [如果大包是尾包 3，则没有首包]
if ( 3 == block ){
if (3 == block) {
// packNo = 3;
packNo = 2;
}
// [如果大包是中间包 2，则全部是中间包]
if( 2 == block){
if (2 == block) {
packNo = 2;
}
data.put("packSn$option", packNo);
@@ -1330,7 +1450,7 @@ public class SydApi4j implements SydApi {
}
} else {
if ( null != iv ) {
if (null != iv) {
data.put("iv", iv);
iv = null;
}
@@ -1339,11 +1459,11 @@ public class SydApi4j implements SydApi {
// 尾包
packNo = 3;
// [如果大包是首包 1，则尾包不是尾包]
if ( 1 == block ){
if (1 == block) {
packNo = 2;
}
// [如果大包是中间包 2，则全部是中间包]
if( 2 == block){
if (2 == block) {
packNo = 2;
}
data.put("packSn$option", packNo);
@@ -1409,8 +1529,8 @@ public class SydApi4j implements SydApi {
println("\n\t IV=" + Util.bytes2HexString(niv));
iv = niv;
//存储iv
retWrap.put("iv",iv);
System.out.println("下一iv长度:"+iv.length);
retWrap.put("iv", iv);
System.out.println("下一iv长度:" + iv.length);
}
}
@@ -1420,16 +1540,16 @@ public class SydApi4j implements SydApi {
// System.out.println("res_msh长度:"+res_msg.length);
// println("\n\t res_msg=" + Util.bytes2HexString(res_msg));
//println("\n\t res_msg=" + Util.bytes2HexString(res_msg));
if (retWrap.containsKey("msg_all")){
if (retWrap.containsKey("msg_all")) {
byte[] msg_all = (byte[]) retWrap.get("msg_all");
byte[] result=new byte[res_msg.length+msg_all.length];
byte[] result = new byte[res_msg.length + msg_all.length];
System.arraycopy(msg_all, 0, result, 0, msg_all.length);
System.arraycopy(res_msg, 0, result, msg_all.length, res_msg.length);
retWrap.put("msg_all", result);
// println("\n\t msg_all=" + Util.bytes2HexString(result));
}else {
} else {
retWrap.put("msg_all", res_msg);
}
@@ -1441,7 +1561,6 @@ public class SydApi4j implements SydApi {
}
@Override
public boolean SYMDecryptDataWithFile(int nAlg, String seesionKey, String inputPath, String outputPath) {
@@ -1624,6 +1743,7 @@ public class SydApi4j implements SydApi {
/**
* E0 指令复合接口
*
* @param isEn
* @param nAlg
* @param seesionKey
@@ -1641,7 +1761,7 @@ public class SydApi4j implements SydApi {
HashMap<String, Object> data = new HashMap<String, Object>();
// 确认算法
if ( isEn ){
if (isEn) {
switch (nAlg) {
case 0:
data.put("alg$option", 0x0);
@@ -1684,20 +1804,19 @@ public class SydApi4j implements SydApi {
data.put("msg", pInData);
packet.put("data", data);
// Map<String, Object> map=new HashMap<>();
// Map<String, Object> map=new HashMap<>();
// Map<String, Object> map = repackEncrypt(packet);
// Map<String, Object> map = repackEncrypt(packet);
// Map<String, Object> map = repackEncrypt(packet,!isEn);
// Map<String, Object> map = repackEncrypt(packet,!isEn);
RetWrap retWrap = repackEncrypt(packet, !isEn);
// System.out.println(retWrap);
// System.out.println(retWrap);
return retWrap;
}
@Override
public byte[] SYMEncryptData(int nAlg, String seesionKey, int fullMode, byte[] pInData) {
@@ -1737,6 +1856,7 @@ public class SydApi4j implements SydApi {
}
@Override
public byte[] SYMEncryptData_nofill(int nAlg, String seesionKey, byte[] pInData) {
if (2 == nAlg && 'L' != seesionKey.charAt(0)) {
@@ -2206,7 +2326,7 @@ public class SydApi4j implements SydApi {
@Override
public RetWrap SM2OrRSAGenKeyPair(int keyType, String index, int length) {
System.out.println( getClass().getClassLoader().hashCode() );
System.out.println(getClass().getClassLoader().hashCode());
ProtoE2 proto = new ProtoE2();
HashMap<String, Object> packet = new HashMap();
@@ -2256,7 +2376,8 @@ public class SydApi4j implements SydApi {
}
public boolean RSAVerify(int HashMark, int nOrgDataType, byte[] publickey, byte[] orgData, byte[] base64Sign) {
@Override
public boolean RSAVerify(int HashMark, int nOrgDataType, byte[] publicKey, byte[] orgData, byte[] base64Sign) {
Proto7C proto = new Proto7C();
byte[] sign = base64Sign;
@@ -2269,7 +2390,7 @@ public class SydApi4j implements SydApi {
data.put("hashMark$option", HashMark);
data.put("signature", sign);
data.put("hashData", orgData);
data.put("publicKey", publickey);
data.put("publicKey", publicKey);
ByteBuffer bb = proto.rend(packet);
@@ -2294,6 +2415,7 @@ public class SydApi4j implements SydApi {
}
}
@Override
public byte[] RSASignC(String privateKeyIndex, int HashMark, int nOrgDataType, byte[] orgData) {
Proto7B proto = new Proto7B();
HashMap<String, Object> packet = new HashMap();
@@ -2308,7 +2430,6 @@ public class SydApi4j implements SydApi {
data.put("privateKeyTag", SYMUtil.genPrivateKeyMark(privateKeyIndex, "000", "00000001"));
ByteBuffer bb = proto.rend(packet);
synchronized (this) {
@@ -2370,7 +2491,7 @@ public class SydApi4j implements SydApi {
RetWrap rw = new RetWrap();
byte[] lmks = ((PacketSection) ret.get("lmk")).getBytes();
byte[] lmkHeads = ((PacketSection) ret.get("lmkHead")).getBytes();
byte[] bs= new byte[lmks.length + lmkHeads.length];
byte[] bs = new byte[lmks.length + lmkHeads.length];
System.arraycopy(lmkHeads, 0, bs, 0, lmkHeads.length);
System.arraycopy(lmks, 0, bs, lmkHeads.length, lmks.length);
rw.put("lmkKey", bs);
@@ -2380,6 +2501,46 @@ public class SydApi4j implements SydApi {
}
}
@Override
public String RSAGetPublicKeyC(String userId, int nKeyType) {
//ProtocolRender render = pset.getProtocolReqRender("QQ");
ProtoQQ proto = new ProtoQQ();
HashMap<String, Object> packet = new HashMap<String, Object>();
HashMap<String, Object> data = new HashMap<String, Object>();
packet.put("data", data);
PacketSN sn = PacketSN.gen();
packet.put("header", sn.getSn().array());
data.put("privateKeyTag", SYMUtil.genPrivateKeyMark(userId, 0 == nKeyType ? "000" : "001", "00000001"));
// 渲染发送
ByteBuffer bb = proto.rend(packet);
//System.out.println(Util.bytes2HexString(Util.toArray(bb)));
synchronized (this) {
// 响应解析
bb = syncRead(syncSend(bb));
}
//ProtocolParser parser = pset.getProtocolResParse();
Packet p = proto.parse(bb);
Map<String, Object> ret = p.toMap();
if (
!Arrays.equals(sn.getSn().array(), ((PacketSection) ret.get("header")).getBytes())
) {
throw new SydApiException("包序号不匹配", -4);
}
ret = (Map<String, Object>) ret.get("data");
PacketSection error = (PacketSection) ret.get("error");
if (!"00".equals(error.getString())) {
throw new SydApiException(error.getInfo(), error.autoInt());
}
int len = Integer.parseInt(((PacketSection) ret.get("publicLen")).getString());
if (len == 128) {
return "03420004" + ((PacketSection) ret.get("publicKey")).getString();
}
System.out.println("len=" + len);
return Util.bytes2HexString(((PacketSection) ret.get("publicKey")).getBytes());
}
@Override
public String SM2GetPublicKeyC(String userId, int nKeyType) {
@@ -2688,13 +2849,12 @@ public class SydApi4j implements SydApi {
}
public boolean SM2Verify(
int nOrgDataType,
byte[] publicKey,
byte[] orgData,
String base64Sign
){
) {
String certNo = "1234567812345678";
//ProtocolRender render = pset.getProtocolReqRender("75");
Proto75 proto = new Proto75();
@@ -2732,7 +2892,6 @@ public class SydApi4j implements SydApi {
}
@Override
public String SM2Sign(
int nOrgDataType,
@@ -2781,8 +2940,6 @@ public class SydApi4j implements SydApi {
}
@Override
public boolean SM2VerifyCustomized(String certNo, byte[] orgData, String base64Sign) {
@@ -2950,6 +3107,7 @@ public class SydApi4j implements SydApi {
* @param pk HEX 格式的公钥
* @return
*/
@Override
public byte[] encryptByPk(int alg, String pk, byte[] data) {
byte[] algBin = 0 == alg ? DTO77.Req.Data.AlgorithmKeyOptions.OPVRSA.getBin() : DTO77.Req.Data.AlgorithmKeyOptions.OPVSM2.getBin();
@@ -2990,6 +3148,38 @@ public class SydApi4j implements SydApi {
return decryptBySk(alg, sk, SYMUtil.base64EnData2DerEnData(data));
}
@Override
public byte[] decryptBySkC(int alg, String userId, byte[] data) {
byte[] algBin = 0 == alg ? DTO78.Req.Data.AlgorithmKeyOptions.OPVRSA.getBin() : DTO78.Req.Data.AlgorithmKeyOptions.OPVSM2.getBin();
Proto78 proto = new Proto78();
DTO78.Req req = new DTO78.Req()
.setHeader( PacketSN.gen().getSn().array() )
.buildData()
.setAlgorithmKey( algBin )
.setFillKey( DTO78.Req.Data.FillKeyOptions.OPVPKCS1v15填充方式.getBin() )
.setPrivateKeyTag( SYMUtil.genPrivateKeyMark(userId, SYMUtil.KT_ENCRYPT, "00000001").getBytes() )
.setInfoData( data )
.closeBuilding();
ByteBuffer bb = proto.rend( req.toSoup() );
synchronized (this) {
// 响应解析
bb = syncRead(syncSend(bb));
}
Packet p = proto.parse(bb);
DTO78.Res res = new DTO78.Res();
res = res.fullFromSoup( proto.parse(bb).resSoup() );
if ( "3030".equals(res.getData().getErrorAsHex()) ){
return res.getData().getDataAsBin();
} else {
throw SydApiException.fromBin(res.getData().getErrorAsBin(), res.getData().getErrorCn());
}
}
@Override
public byte[] decryptBySk(int alg, String sk, byte[] data) {
byte[] algBin = 0 == alg ? DTO78.Req.Data.AlgorithmKeyOptions.OPVRSA.getBin() : DTO78.Req.Data.AlgorithmKeyOptions.OPVSM2.getBin();
@@ -3023,6 +3213,56 @@ public class SydApi4j implements SydApi {
}
}
/**
* 用指定的 RSA 私钥对指定的密文数据进行加密。
*
* @param publicKey 私钥串，DER 编码，HEX 格式。
* @param pOrgData 加密的数据。
* @return 加密的数据 base64 编码。
*/
@Override
public String RSAEncrypt(
String publicKey,
byte[] pOrgData
) {
return Util.encodeBase64(encryptByPk(0, publicKey, pOrgData));
}
/**
* 通过使用者 ID 所对应的私钥对指定的密文数据进行解密。
*
* @param userId 使用者的 ID，最大长度为 16 位数字，右对齐。
* @param pEnData 加密的数据，base64 编码。
* @return 明文数据。
*/
@Override
public byte[] RSADecryptC(
String userId,
String pEnData
) {
return decryptBySk(0, userId, Util.decodeBase64(pEnData));
}
/**
* 使用外部私钥解密
*
* @param sk HEX 私钥值
* @param enData base64 值
* @return
*/
@Override
public byte[] RSADecrypt(String sk, String enData) {
return decryptBySk(0, sk, Util.decodeBase64(enData));
}
@Override
public String SM2Encrypt(byte[] publicKey, byte[] pOrgData) {
Proto77 proto = new Proto77();
@@ -3059,6 +3299,48 @@ public class SydApi4j implements SydApi {
return SYMUtil.derEnData2Base64EnData(((PacketSection) ret.get("cipherData")).getBytes());
}
@Override
public byte[] SM2Decrypt(byte[] sk, String enData) {
//ProtocolRender render = pset.getProtocolReqRender("78");
Proto78 proto = new Proto78();
byte[] pOrgData = SYMUtil.base64EnData2DerEnData(enData);
// 填充数据
HashMap<String, Object> packet = new HashMap<String, Object>();
HashMap<String, Object> data = new HashMap<String, Object>();
packet.put("data", data);
PacketSN sn = PacketSN.gen();
packet.put("header", sn.getSn().array());
data.put("AlgorithmKey$option", 1);
data.put("infoData", pOrgData);
data.put("privateKeyTag", "999999999999999999999999999");
data.put("privateKey", sk);
// 渲染发送
ByteBuffer bb = proto.rend(packet);
synchronized (this) {
// 响应解析
bb = syncRead(syncSend(bb));
}
//ProtocolParser parser = pset.getProtocolResParse();
Packet p = proto.parse(bb);
Map<String, Object> ret = p.toMap();
if (
!Arrays.equals(sn.getSn().array(), ((PacketSection) ret.get("header")).getBytes())
) {
throw new SydApiException("包序号不匹配", -4);
}
ret = (Map<String, Object>) ret.get("data");
PacketSection error = (PacketSection) ret.get("error");
if (!"00".equals(error.getString())) {
throw new SydApiException(error.getInfo(), error.autoInt());
}
return ((PacketSection) ret.get("data")).getBytes();
}
@Override
public byte[] SM2DecryptC(String userId, String enData) {
//ProtocolRender render = pset.getProtocolReqRender("78");
@@ -3380,8 +3662,8 @@ public class SydApi4j implements SydApi {
}
RetWrap rw = new RetWrap();
System.out.println("lmkHead" + ((PacketSection) ret.get("lmkHead")).getString() +
"\nlmk" + ((PacketSection) ret.get("lmk")).getString());
// System.out.println("lmkHead" + ((PacketSection) ret.get("lmkHead")).getString() +
// "\nlmk" + ((PacketSection) ret.get("lmk")).getString());
rw.put(SydApi.RET_SESSION_KEY, ((PacketSection) ret.get("lmkHead")).getString() +
@@ -4247,6 +4529,12 @@ public class SydApi4j implements SydApi {
@Override
public String GenerateMIYA(String AreaCode, int Version, int Alg, byte[] Data) {
return GenerateMIYA(AreaCode, Version, Alg, Data, MIYA_FULL_WEAK, MIYA_MAC_LEN_4);
}
@Override
public String GenerateMIYA(String AreaCode, int Version, int Alg, byte[] Data, byte fullFlag, byte macLenFlag) {
if (Version < 0 || Version > 999) {
throw new SydApiException("Version 范围不对", 21);
}
@@ -4287,6 +4575,8 @@ public class SydApi4j implements SydApi {
data.put("MACData", Util.bytes2HexString(Data).getBytes());
data.put("key", key);
data.put("full", fullFlag);
data.put("macLen", macLenFlag);
// 渲染发送
ByteBuffer bb = proto.rend(packet);
@@ -4317,6 +4607,11 @@ public class SydApi4j implements SydApi {
@Override
public boolean VerifyMIYA(String AreaCode, int Version, int Alg, String mac, byte[] Data) {
return VerifyMIYA(AreaCode, Version, Alg, mac, Data, MIYA_FULL_WEAK, MIYA_MAC_LEN_4);
}
@Override
public boolean VerifyMIYA(String AreaCode, int Version, int Alg, String mac, byte[] Data, byte fullFlag, byte macLenFlag) {
if (Version < 0 || Version > 999) {
throw new SydApiException("Version 范围不对", 21);
@@ -4359,6 +4654,8 @@ public class SydApi4j implements SydApi {
data.put("MAC", mac);
data.put("MACData", Util.bytes2HexString(Data).getBytes());
data.put("key", key);
data.put("full", fullFlag);
data.put("macLen", macLenFlag);
// 渲染发送
ByteBuffer bb = proto.rend(packet);
@@ -4735,7 +5032,7 @@ public class SydApi4j implements SydApi {
bb = syncRead(syncSend(bb));
}
Packet p = proto.parse(bb,packet);
Packet p = proto.parse(bb, packet);
Map<String, Object> ret = p.toMap();
if (
@@ -5578,7 +5875,7 @@ public class SydApi4j implements SydApi {
RetWrap rw = new RetWrap();
byte[] keys = ((PacketSection) ret.get("key")).getBytes();
byte[] keyHeads = ((PacketSection) ret.get("keyHead")).getBytes();
byte[] bs= new byte[keys.length + keyHeads.length];
byte[] bs = new byte[keys.length + keyHeads.length];
System.arraycopy(keyHeads, 0, bs, 0, keyHeads.length);
System.arraycopy(keys, 0, bs, keyHeads.length, keys.length);
rw.put("key", bs);
@@ -5645,7 +5942,19 @@ public class SydApi4j implements SydApi {
return true;
}
//9.2 数据转加密指令(Y0)(=) -> pass (注:密文数据那项不一定需要传加密出来的数据)
/**
* 数据转加密指令(Y0)(=) -> pass (注:密文数据那项不一定需要传加密出来的数据)
* @param srcType 源密钥类型
* @param sca 源算法SCA
* @param desKeyType 目的秘钥类型
* @param dca 目的算法SCA
* @param roundModel 加密模式
* @param sDEK 源秘钥DEK
* @param dDEK 目的秘钥DEK
* @param infoData 密文数据
* @param vector 向量
* @return byte[] 目的密钥加密的密文数据
*/
public byte[] switchEncryY(String srcType, int sca, String desKeyType, int dca, int roundModel, String sDEK, String dDEK, byte[] infoData, String vector) {
ProtoY0 proto = new ProtoY0();
HashMap<String, Object> packet = new HashMap();
@@ -7047,7 +7356,7 @@ public class SydApi4j implements SydApi {
}
//1.1生成一个对称密钥(*) -> pass (对比之前添加了可产生ZMK加密下的密钥)
public RetWrap genSymKey(int mode,String keyType, char solution,String zmk) {
public RetWrap genSymKey(int mode, String keyType, char solution, String zmk) {
ProtoA0 proto = new ProtoA0();
HashMap<String, Object> packet = new HashMap();
HashMap<String, Object> data = new HashMap();
@@ -7055,7 +7364,7 @@ public class SydApi4j implements SydApi {
packet.put("data", data);
PacketSN sn = PacketSN.gen();
packet.put("header", sn.getSn().array());
data.put("mode$option",mode);
data.put("mode$option", mode);
data.put("keyType", keyType);
data.put("solution", solution);
data.put("zmk", zmk);
@@ -7086,7 +7395,7 @@ public class SydApi4j implements SydApi {
System.arraycopy(lmkHeads, 0, bs1, 0, lmkHeads.length);
System.arraycopy(lmks, 0, bs1, lmkHeads.length, lmks.length);
rw.put("lmkKey", bs1);
if(1== mode) {
if (1 == mode) {
byte[] zmks = ((PacketSection) ret.get("zmk")).getBytes();
byte[] zmkHeads = ((PacketSection) ret.get("zmkHead")).getBytes();
byte[] bs2 = new byte[zmks.length + zmkHeads.length];
@@ -7110,7 +7419,7 @@ public class SydApi4j implements SydApi {
packet.put("data", data);
PacketSN sn = PacketSN.gen();
packet.put("header", sn.getSn().array());
data.put("roleInfo",roleInfo.getBytes());
data.put("roleInfo", roleInfo.getBytes());
ByteBuffer bb = proto.rend(packet);
@@ -7189,7 +7498,7 @@ public class SydApi4j implements SydApi {
}
//17.11 获取应用密钥明文(+) -> PASS
public RetWrap getPlainText(String key, int checkAlg){
public RetWrap getPlainText(String key, int checkAlg) {
ProtoAB proto = new ProtoAB();
// 填充数据
@@ -7213,7 +7522,7 @@ public class SydApi4j implements SydApi {
bb = syncRead(syncSend(bb));
}
//ProtocolParser parser = pset.getProtocolResParse();
Packet p = proto.parse(bb,packet);
Packet p = proto.parse(bb, packet);
Map<String, Object> ret = p.toMap();
if (
!Arrays.equals(sn.getSn().array(), ((PacketSection) ret.get("header")).getBytes())
@@ -7235,7 +7544,7 @@ public class SydApi4j implements SydApi {
}
@Override
public byte[] directBytes(byte[] data){
public byte[] directBytes(byte[] data) {
//初始化一个和byte长度一样的bb
ByteBuffer bb = ByteBuffer.allocate(data.length);
// 数组放到bb中
@@ -7248,13 +7557,15 @@ public class SydApi4j implements SydApi {
//重置 limit 和postion 值
bb.flip();
//获取bb中有效大小
int len=bb.limit() - bb.position();
int len = bb.limit() - bb.position();
byte [] bytes=new byte[len];
byte[] bytes = new byte[len];
for (int i = 0; i < bytes.length; i++) {
bytes[i]=bb.get();
bytes[i] = bb.get();
}
return bytes;
};
}
;
}