初始化主密钥

chsm-common/src/main/java/com/sunyard/chsm/mapper/SpDeviceMapper.java

@@ -1,13 +1,25 @@
 package com.sunyard.chsm.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sunyard.chsm.model.entity.Device;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @author liulu
  * @since 2024/10/17
  */
 @Mapper
 public interface SpDeviceMapper extends BaseMapper<Device> {
+
+    default List<Device> selectConnedList() {
+        return selectList(
+                new LambdaQueryWrapper<Device>()
+                        .eq(Device::getConnected, true)
+        );
+    }
+
+
 }

chsm-common/src/main/java/com/sunyard/chsm/model/entity/TmkInfo.java

@@ -17,6 +17,7 @@ public class TmkInfo {
 
     private String deviceSerial;
     private String encTmk;
+    private String pubKey;
 
     private String remark;
     private LocalDateTime createTime;

chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/BcSdfApiAdaptor.java

@@ -2,14 +2,16 @@ package com.sunyard.chsm.sdf.adapter;
 
 import com.sunyard.chsm.sdf.model.DeviceInfo;
 import com.sunyard.chsm.sdf.model.EccKey;
-import com.sunyard.chsm.sdf.model.EccPriKey;
-import com.sunyard.chsm.sdf.model.EccPubKey;
 import com.sunyard.chsm.sdf.util.LangUtils;
+import com.sunyard.chsm.utils.gm.BCECUtils;
 import com.sunyard.chsm.utils.gm.BCSM2Utils;
 import lombok.SneakyThrows;
+import org.bouncycastle.crypto.InvalidCipherTextException;
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
 import org.bouncycastle.math.ec.ECPoint;
+import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.BigIntegers;
 
 import java.math.BigInteger;
@@ -70,10 +72,10 @@ public class BcSdfApiAdaptor implements SdfApiAdapter {
     }
 
     @Override
-    public EccPubKey exportEncPublicKeyECC(String sessionHandle, int uiKeyIndex) {
+    public byte[] exportEncPublicKeyECC(String sessionHandle, int uiKeyIndex) {
         BigInteger d = new BigInteger(1, getD());
         ECPoint q = BCSM2Utils.G_POINT.multiply(d).normalize();
-        return new EccPubKey(256, q.getXCoord().getEncoded(), q.getYCoord().getEncoded());
+        return LangUtils.merge(q.getXCoord().getEncoded(), q.getYCoord().getEncoded());
     }
 
     private byte[] getD() {
@@ -93,7 +95,29 @@ public class BcSdfApiAdaptor implements SdfApiAdapter {
         byte[] x = pubKey.getQ().getXCoord().getEncoded();
         byte[] y = pubKey.getQ().getYCoord().getEncoded();
         byte[] d = BigIntegers.asUnsignedByteArray(32, priKey.getD());
-        return new EccKey(new EccPubKey(256, x, y), new EccPriKey(256, d));
+        return new EccKey(LangUtils.merge(x, y), d);
+    }
+
+    @Override
+    public byte[] exchangeDigitEnvelopeBaseOnECC(String sessionHandle, int uiKeyIndex, byte[] pubKey, byte[] pucEncDateIn) {
+        return new byte[0];
+    }
+
+    @Override
+    public byte[] externalEncryptECC(String sessionHandle, byte[] pubKey, byte[] pucData) {
+        if (pubKey[0] == 4) {
+            pubKey = Arrays.copyOfRange(pubKey, 1, 65);
+        }
+        ECPublicKeyParameters parameters = BCECUtils.createECPublicKeyParameters(
+                Arrays.copyOfRange(pubKey, 0, 32),
+                Arrays.copyOfRange(pubKey, 32, 64)
+        );
+        try {
+            byte[] encrypt = BCSM2Utils.encrypt(parameters, pucData);
+            return Arrays.copyOfRange(encrypt, 1, encrypt.length);
+        } catch (InvalidCipherTextException e) {
+            throw new RuntimeException(e);
+        }
     }
 
 

chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/JnaSdfAdaptor.java

@@ -2,11 +2,12 @@ package com.sunyard.chsm.sdf.adapter;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.PointerByReference;
+import com.sunyard.chsm.sdf.context.AlgId;
 import com.sunyard.chsm.sdf.lib.SdfLibrary;
 import com.sunyard.chsm.sdf.model.DeviceInfo;
 import com.sunyard.chsm.sdf.model.EccKey;
-import com.sunyard.chsm.sdf.model.EccPubKey;
 import com.sunyard.chsm.sdf.model.SDF_DeviceInfo;
+import com.sunyard.chsm.sdf.util.LangUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.Assert;
@@ -117,15 +118,28 @@ public abstract class JnaSdfAdaptor implements SdfApiAdapter {
     }
 
     @Override
-    public EccPubKey exportEncPublicKeyECC(String sessionHandle, int uiKeyIndex) {
+    public byte[] exportEncPublicKeyECC(String sessionHandle, int uiKeyIndex) {
         byte[] pubKey = new byte[132];
         Pointer hSessionHandle = getSessionHandle(sessionHandle);
         sdfLibrary.SDF_ExportEncPublicKey_ECC(hSessionHandle, uiKeyIndex, pubKey);
-        return new EccPubKey(256, Arrays.copyOfRange(pubKey, 36, 68), Arrays.copyOfRange(pubKey, 100, 132));
+        return LangUtils.merge(Arrays.copyOfRange(pubKey, 36, 68), Arrays.copyOfRange(pubKey, 100, 132));
     }
 
     @Override
     public EccKey generateKeyPairECC(String sessionHandle, String alg, int uiKeyBits) {
         return null;
     }
+
+    @Override
+    public byte[] exchangeDigitEnvelopeBaseOnECC(String sessionHandle, int uiKeyIndex, byte[] pubKey, byte[] pucEncDateIn) {
+        return new byte[0];
+    }
+
+    @Override
+    public byte[] externalEncryptECC(String sessionHandle, byte[] pubKey, byte[] pucData) {
+        byte[] encData = new byte[128 + 32 + 4 + pucData.length];
+        Pointer hSessionHandle = getSessionHandle(sessionHandle);
+        sdfLibrary.SDF_ExternalEncrypt_ECC(hSessionHandle, getAlgId(AlgId.SGD_SM2_3), pubKey, pucData, pucData.length, encData);
+        return encData;
+    }
 }

chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/SdfApiAdapter.java

@@ -2,7 +2,6 @@ package com.sunyard.chsm.sdf.adapter;
 
 import com.sunyard.chsm.sdf.model.DeviceInfo;
 import com.sunyard.chsm.sdf.model.EccKey;
-import com.sunyard.chsm.sdf.model.EccPubKey;
 
 /**
  * @author liulu
@@ -54,9 +53,9 @@ public interface SdfApiAdapter {
      * 导出ECC加密公钥
      *
      * @param uiKeyIndex 密码设备存储的ECC密钥对索引值
-     * @return pucPublicKeyEcc 返回ECC加密公钥
+     * @return pucPublicKeyEcc 返回ECC加密公钥x+y
      */
-    EccPubKey exportEncPublicKeyECC(String sessionHandle, int uiKeyIndex);
+    byte[] exportEncPublicKeyECC(String sessionHandle, int uiKeyIndex);
 
     /**
      * 产生ECC密钥对并输出
@@ -68,4 +67,10 @@ public interface SdfApiAdapter {
     EccKey generateKeyPairECC(String sessionHandle, String alg, int uiKeyBits);
 
 
+    byte[] exchangeDigitEnvelopeBaseOnECC(String sessionHandle, int uiKeyIndex, byte[] pubKey, byte[] pucEncDateIn);
+
+
+    byte[] externalEncryptECC(String sessionHandle, byte[] pubKey, byte[] pucData);
+
+
 }

chsm-common/src/main/java/com/sunyard/chsm/sdf/model/EccKey.java

@@ -12,10 +12,10 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class EccKey {
 
-    private EccPubKey pubKey;
-    private EccPriKey priKey;
+    private byte[] pubKey;
+    private byte[] priKey;
 
-    public EccKey(EccPubKey pubKey, EccPriKey priKey) {
+    public EccKey(byte[] pubKey, byte[] priKey) {
         this.pubKey = pubKey;
         this.priKey = priKey;
     }