cert 初步测试通过

src/test/java/minsecurity/certificate/cert/TestCert.java

@@ -0,0 +1,86 @@
+package minsecurity.certificate.cert;
+
+import minsecurity.Common;
+import minsecurity.crypto.sm2.Sm2Base;
+import minsecurity.crypto.sm2.Sm2PrivateKey;
+import minsecurity.crypto.sm2.Sm2PublicKey;
+import minsecurity.crypto.sm2.TestSm2;
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import org.junit.Assert;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.slf4j.LoggerFactory;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.security.*;
+
+/*
+ * @Author: hongyu guo
+ * @Description:
+ * @Version: 1.0.0
+ * @Date: 15:57 2021/03/06
+ * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室
+ */
+public class TestCert {
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestCert.class);
+    @Test
+    public void testCertSignAndVerify() throws Exception {
+        AsymmetricCipherKeyPair keyPair = Sm2Base.generateKeyPairParameter();
+        ECPrivateKeyParameters priKey = (ECPrivateKeyParameters) keyPair.getPrivate();
+        ECPublicKeyParameters pubKey = (ECPublicKeyParameters) keyPair.getPublic();
+        byte[] d = priKey.getD().toByteArray();
+        // d = Arrays.copyOf(d,32);
+        byte[] x = pubKey.getQ().getAffineXCoord().getEncoded();
+        byte[] y = pubKey.getQ().getAffineYCoord().getEncoded();
+        Sm2PrivateKey sm2PrivateKey = new Sm2PrivateKey(d);
+        Sm2PublicKey sm2PublicKey = new Sm2PublicKey(x,y);
+
+
+        Certificate certificate = new Certificate(1,1,sm2PublicKey,
+                null, Common.SM3withSM2,Common.SM2,
+                "issueTo","issuer",System.currentTimeMillis(),
+                System.currentTimeMillis() + 200, Common.CertSign,
+                true,System.currentTimeMillis());
+        certificate.signCert(sm2PrivateKey);
+        // logger.debug(certificate.toString());
+
+        boolean verify = Certificate.verifyCert(certificate, certificate);
+        assertTrue(verify);
+    }
+
+    @Test
+    public void testCert2Pem() throws Exception {
+        AsymmetricCipherKeyPair keyPair = Sm2Base.generateKeyPairParameter();
+        ECPrivateKeyParameters priKey = (ECPrivateKeyParameters) keyPair.getPrivate();
+        ECPublicKeyParameters pubKey = (ECPublicKeyParameters) keyPair.getPublic();
+        byte[] d = priKey.getD().toByteArray();
+        // d = Arrays.copyOf(d,32);
+        byte[] x = pubKey.getQ().getAffineXCoord().getEncoded();
+        byte[] y = pubKey.getQ().getAffineYCoord().getEncoded();
+        Sm2PrivateKey sm2PrivateKey = new Sm2PrivateKey(d);
+        Sm2PublicKey sm2PublicKey = new Sm2PublicKey(x,y);
+
+
+        Certificate certificate = new Certificate(1,1,sm2PublicKey,
+                null, Common.SM3withSM2,Common.SM2,
+                "issueTo","issuer",System.currentTimeMillis(),
+                System.currentTimeMillis() + 111111, Common.CertSign,
+                true,System.currentTimeMillis());
+        certificate.signCert(sm2PrivateKey);
+
+        String pem = certificate.toPem(null,0);
+        Certificate certFromPem = Certificate.fromPem(pem, null,0);
+        logger.debug(certFromPem.toString());
+        assertTrue(Certificate.verifyCert(certFromPem,certFromPem));
+
+        String pem2 = certificate.toPem(new byte[]{1,2,3,4,5,6,7,8},Common.SM4ECB);
+        Certificate certFromPem2 = Certificate.fromPem(pem2, new byte[]{1,2,3,4,5,6,7,8},Common.SM4ECB);
+        logger.debug(certFromPem.toString());
+        assertTrue(Certificate.verifyCert(certFromPem2,certFromPem2));
+    }
+
+}

src/test/java/minsecurity/certificate/x509/TestX509.java

@@ -1,4 +1,4 @@
-package minsecurity.crypto;
+package minsecurity.certificate.x509;
 
 import minsecurity.Common;
 import minsecurity.certificate.X509.X509CertMaker;
@@ -31,16 +31,17 @@ import static minsecurity.certificate.X509.X509CertMaker.makeRootCA;
  * @Date: 22:55 2021/03/04
  * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室
  */
-public class TestCert {
+public class TestX509 {
     static {
         Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
     }
-    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestCert.class);
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestX509.class);
     private static final Provider BC = new BouncyCastleProvider();
 
     @Test
     public void testRebuildKeyPair(){
         try {
+
             KeyPair rootKP = Sm2Base.generateKeyPair();
             X509Certificate rootCA = makeRootCA(rootKP,"CN","MIN",
                     "MIN-GROUP","MIN ROOT CA",

src/test/java/minsecurity/crypto/sm2/TestSm2.java

@@ -5,6 +5,7 @@ import org.bouncycastle.crypto.CryptoException;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.slf4j.LoggerFactory;
@@ -88,9 +89,9 @@ public class TestSm2 {
         // BigInteger bigInteger = priKey.getD();
         Sm2PrivateKey sm2PrivateKey = new Sm2PrivateKey(d);
         Sm2PublicKey sm2PublicKey = new Sm2PublicKey(x,y);
-        String content = "this is hell";
-        byte[] digest = sm2PrivateKey.sign(content.getBytes());
-        boolean flag = sm2PublicKey.verify(content.getBytes(), digest);
+        String content = "7b227462734365727469666963617465223a7b2276657273696f6e223a312c2273657269616c4e756d626572223a312c227075626c69634b6579223a22424a304d7047714e5958706b695879575a4d6e5838776d6b694a51326f576d37336257615932525473706b695058342f37705443666332764e7272596e766c6a644d3448647850537531753272616363506c74485245593d222c227369676e6174757265416c676f726974686d223a302c227075626c69634b6579416c676f726974686d223a302c226973737565546f223a226973737565546f222c22697373756572223a22697373756572222c226e6f744265666f7265223a313631353032303130393339352c226e6f744166746572223a313631353032303130393539352c226b65795573616765223a322c2274696d657374616d70223a313631353032303130393339352c226361223a747275657d2c227369676e6174757265416c676f726974686d223a302c227369676e617475726556616c7565223a6e756c6c7d";
+        byte[] digest = sm2PrivateKey.sign(ByteUtils.fromHexString(content));
+        boolean flag = sm2PublicKey.verify(ByteUtils.fromHexString(content), digest);
         assertTrue(flag);
     }
 }