security部分添加注释

src/main/java/minsecurity/certificate/cert/Certificate.java

@@ -15,6 +15,7 @@ import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 import java.lang.reflect.Array;
 import java.security.*;
+import java.util.Arrays;
 import java.util.Base64;
 
 import static minsecurity.certificate.cert.CertUtils.*;
@@ -22,7 +23,7 @@ import static minsecurity.certificate.cert.CertUtils.*;
 
 /*
  * @Author: hongyu guo
- * @Description:
+ * @Description: 证书bean类
  * @Version: 1.0.0
  * @Date: 17:05 2021/03/05
  * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室
@@ -174,104 +175,23 @@ public class Certificate {
         this.publicKey = publicKey;
     }
 
-
-    public void signCert(PrivateKeyInterface priv) throws Exception {
-        byte[] bytesOfCert = serialization(CertUtils.parseCertToInnerCert(this).getTbsCertificate());
-        logger.debug("签名序列化bytes: {}", ByteUtils.toHexString(bytesOfCert));
-        switch (this.signatureAlgorithm){
-            case Common.SM3withSM2:
-                // byte[] digest = HashAlgo.sm3(bytesOfCert);
-                this.signature = priv.sign(bytesOfCert);
-                logger.debug("签名sign: {}", ByteUtils.toHexString(this.signature));
-                // Sm2PublicKey sm2PublicKey = (Sm2PublicKey) this.publicKey;
-                // logger.debug("临时验签: {}", sm2PublicKey.verify(bytesOfCert, signature));
-                break;
-            default:
-                logger.debug("signAlgo: {}",this.signatureAlgorithm);
-                throw new Exception("未定义的签名方法");
-        }
-    }
-
-    public static boolean verifyCert(Certificate ca, Certificate sub) throws Exception {
-        InnerCertificate innerCertificate = CertUtils.parseCertToInnerCert(sub);
-        switch (innerCertificate.getTbsCertificate().getVersion()){
-            case CertUtils.VERSION1:
-                boolean isValid = CertUtils.checkDuration(innerCertificate);
-                logger.debug("有效期内：{}", isValid);
-                if(!isValid)
-                    return false;
-                if(sub.isCA()){
-                    return checkSign(innerCertificate, sub.getPublicKey());
-                } else {
-                    return checkSign(innerCertificate, ca.getPublicKey());
-                }
-            default:
-                return false;
-        }
-    }
-
-    public String toPem(byte[] passwd, int symAlgoMode) throws CertException, NoSuchPaddingException, InvalidAlgorithmParameterException, NoSuchAlgorithmException, IllegalBlockSizeException, BadPaddingException, NoSuchProviderException, InvalidKeyException {
-        if(this.getSignature() == null){
-            throw new CertException("该证书未签名");
-        }
-        byte[] bytesOfCert = serialization(CertUtils.parseCertToInnerCert(this));
-        byte[] ret = new byte[0];
-        if(passwd != null && passwd.length > 0){
-            byte[] hashPasswd = HashAlgo.sm3(passwd);
-            if( hashPasswd.length == 32){
-                for(int i = 0; i < 16; i++){
-                    hashPasswd[i] += hashPasswd[i + 16];
-                }
-            }
-            byte[] sm4Key = new byte[16];
-            System.arraycopy(hashPasswd,0,sm4Key,0,16);
-
-            switch (symAlgoMode){
-                case Common.SM4CBC:{
-                    // TODO: PADDING???  IV?????
-                    ret = Sm4.encrypt_CBC_Padding(sm4Key, new byte[16],bytesOfCert);
-                    break;
-                }
-                case Common.SM4ECB:{
-                    ret = Sm4.encrypt_ECB_Padding(sm4Key, bytesOfCert);
-                    break;
-                }
-                default:
-                    throw new CertException("未定义的对称加密算法");
-            }
-        } else {
-            ret = bytesOfCert;
-        }
-        return Base64.getEncoder().encodeToString(ret);
-    }
-
-    public static Certificate fromPem(String pemString, byte[] passwd, int symAlgoMode) throws CertException, BadPaddingException, NoSuchPaddingException, InvalidAlgorithmParameterException, NoSuchAlgorithmException, IllegalBlockSizeException, NoSuchProviderException, InvalidKeyException {
-        if(pemString == null || pemString.equals("")){
-            throw new CertException("pem串为空");
-        }
-        byte[] bytesOfPem = Base64.getDecoder().decode(pemString);
-        byte[] bytesOfCert = new byte[0];
-        if(passwd != null && passwd.length > 0){
-            byte[] hashPasswd = HashAlgo.sm3(passwd);
-            if( hashPasswd.length == 32){
-                for(int i = 0; i < 16; i++){
-                    hashPasswd[i] += hashPasswd[i + 16];
-                }
-            }
-            byte[] sm4Key = new byte[16];
-            System.arraycopy(hashPasswd,0,sm4Key,0,16);
-
-            switch (symAlgoMode){
-                case Common.SM4CBC:
-                    bytesOfCert =  Sm4.decrypt_CBC_Padding(sm4Key,new byte[16], bytesOfPem);
-                case Common.SM4ECB:
-                    bytesOfCert =  Sm4.decrypt_ECB_Padding(sm4Key, bytesOfPem);
-            }
-        } else {
-            bytesOfCert = bytesOfPem;
-        }
-        InnerCertificate innerCertificate = (InnerCertificate) deserialization(bytesOfCert, Common.InnerCertificate);
-        return CertUtils.parseInnerCertToCert(innerCertificate);
+    @Override
+    public String toString() {
+        return "Certificate{" +
+                "version=" + version +
+                ", serialNumber=" + serialNumber +
+                ", publicKey=" + publicKey +
+                ", signature=" + ByteUtils.toHexString(signature) +
+                ", signatureAlgorithm=" + signatureAlgorithm +
+                ", publicKeyAlgorithm=" + publicKeyAlgorithm +
+                ", issueTo='" + issueTo + '\'' +
+                ", issuer='" + issuer + '\'' +
+                ", notBefore=" + notBefore +
+                ", notAfter=" + notAfter +
+                ", keyUsage=" + keyUsage +
+                ", isCA=" + isCA +
+                ", timestamp=" + timestamp +
+                '}';
     }
 
 }