fix: 修复客户端CertificateVerify消息未签名导致decrypt_error错误

aliyun · Sep 6, 2023 · ee032cf · ee032cf
1 parent 243ad23
commit ee032cf
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 8 deletions.
diff --git a/src/main/java/com/aliyun/gmsse/crypto/Crypto.java b/src/main/java/com/aliyun/gmsse/crypto/Crypto.java
@@ -17,18 +17,18 @@
 import org.bouncycastle.asn1.DLSequence;
 import org.bouncycastle.asn1.gm.GMNamedCurves;
 import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.CipherParameters;
+import org.bouncycastle.crypto.CryptoException;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.digests.SM3Digest;
 import org.bouncycastle.crypto.engines.SM2Engine;
 import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
+import org.bouncycastle.crypto.params.*;
+import org.bouncycastle.crypto.signers.SM2Signer;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
+import org.bouncycastle.jce.spec.ECParameterSpec;
 
 public class Crypto {
     private static X9ECParameters x9ECParameters = GMNamedCurves.getByName("sm2p256v1");
@@ -159,4 +159,43 @@ public static byte[] hash(byte[] bytes) {
         digest.doFinal(output, 0);
         return output;
     }
+
+    public static byte[] sign(BCECPrivateKey ecPriKey, byte[] withId, byte[] srcData){
+        ECParameterSpec parameterSpec = ecPriKey.getParameters();
+        ECDomainParameters domainParameters = new ECDomainParameters(parameterSpec.getCurve(), parameterSpec.getG(),
+                parameterSpec.getN(), parameterSpec.getH());
+        ECPrivateKeyParameters priKeyParameters = new ECPrivateKeyParameters(ecPriKey.getD(), domainParameters);
+        SM2Signer signer = new SM2Signer();
+        CipherParameters param = null;
+        ParametersWithRandom pwr = new ParametersWithRandom(priKeyParameters, new SecureRandom());
+        if (withId != null) {
+            param = new ParametersWithID(pwr, withId);
+        } else {
+            param = pwr;
+        }
+        signer.init(true, param);
+        signer.update(srcData, 0, srcData.length);
+        try {
+            return signer.generateSignature();
+        } catch (CryptoException e) {
+            e.printStackTrace();
+        }
+        return new byte[0];
+    }
+    public static boolean verify(BCECPublicKey ecPublicKey, byte[] withId, byte[] srcData,byte[] sign){
+        ECParameterSpec parameterSpec = ecPublicKey.getParameters();
+        ECDomainParameters domainParameters = new ECDomainParameters(parameterSpec.getCurve(), parameterSpec.getG(),
+                parameterSpec.getN(), parameterSpec.getH());
+        ECPublicKeyParameters pubKeyParameters = new ECPublicKeyParameters(ecPublicKey.getQ(), domainParameters);
+        SM2Signer signer = new SM2Signer();
+        CipherParameters param;
+        if (withId != null) {
+            param = new ParametersWithID(pubKeyParameters, withId);
+        } else {
+            param = pubKeyParameters;
+        }
+        signer.init(false, param);
+        signer.update(srcData, 0, srcData.length);
+        return signer.verifySignature(sign);
+    }
 }
diff --git a/src/main/java/com/aliyun/gmsse/protocol/ClientConnectionContext.java b/src/main/java/com/aliyun/gmsse/protocol/ClientConnectionContext.java
@@ -3,6 +3,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.security.PrivateKey;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -14,6 +15,7 @@
 
 import org.bouncycastle.crypto.engines.SM4Engine;
 import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
 
 import com.aliyun.gmsse.AlertException;
@@ -182,7 +184,10 @@ private void sendCertificateVerify() throws IOException {
         for (Handshake handshake : handshakes) {
             out.write(handshake.getBytes());
         }
-        byte[] signature = Crypto.hash(out.toByteArray());
+        // byte[] signature = Crypto.hash(out.toByteArray());
+        byte[] source = Crypto.hash(out.toByteArray());
+        PrivateKey key = sslContext.getKeyManager().getPrivateKey("sign");
+        byte[] signature = Crypto.sign((BCECPrivateKey) key,null,source);
         CertificateVerify cv = new CertificateVerify(signature);
         Handshake hs = new Handshake(Handshake.Type.CERTIFICATE_VERIFY, cv);
         Record rc = new Record(ContentType.HANDSHAKE, version, hs.getBytes());

diff --git a/src/main/java/com/aliyun/gmsse/protocol/ServerConnectionContext.java b/src/main/java/com/aliyun/gmsse/protocol/ServerConnectionContext.java
@@ -19,6 +19,7 @@
 import org.bouncycastle.crypto.engines.SM4Engine;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
 import org.bouncycastle.jcajce.spec.SM2ParameterSpec;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
@@ -123,8 +124,15 @@ private void receiveCertificateVerify() throws IOException {
         for (Handshake handshake : handshakes) {
             out.write(handshake.getBytes());
         }
-        byte[] signature = Crypto.hash(out.toByteArray());
-        if (!Arrays.equals(signature, cv.getSignature())) {
+        // byte[] signature = Crypto.hash(out.toByteArray());
+        // if (!Arrays.equals(signature, cv.getSignature())) {
+        //     throw new SSLException("certificate verify failed");
+        // }
+        X509Certificate signCert = session.peerCerts[0];
+        byte[] source = Crypto.hash(out.toByteArray());
+        boolean flag = Crypto.verify((BCECPublicKey)signCert.getPublicKey(),null,source,
+                cv.getSignature());
+        if (!flag) {
             throw new SSLException("certificate verify failed");
         }
         handshakes.add(cf);