TKSS-625: Remove TlcpSM2PremasterSecretParameterSpec

Tencent · Jan 4, 2024 · 7380f2b · 7380f2b
1 parent bd5d9b8
commit 7380f2b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 160 deletions.
diff --git a/...java/com/tencent/kona/sun/security/internal/spec/TlcpSM2PremasterSecretParameterSpec.java b/...java/com/tencent/kona/sun/security/internal/spec/TlcpSM2PremasterSecretParameterSpec.java
diff --git a/...src/main/java/com/tencent/kona/sun/security/provider/TlcpSM2PremasterSecretGenerator.java b/...src/main/java/com/tencent/kona/sun/security/provider/TlcpSM2PremasterSecretGenerator.java
@@ -25,7 +25,7 @@
 
 package com.tencent.kona.sun.security.provider;
 
-import com.tencent.kona.sun.security.internal.spec.TlcpSM2PremasterSecretParameterSpec;
+import com.tencent.kona.sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
 
 import javax.crypto.KeyGeneratorSpi;
 import javax.crypto.SecretKey;
@@ -39,9 +39,9 @@
 public final class TlcpSM2PremasterSecretGenerator extends KeyGeneratorSpi {
 
     private static final String MSG = "TlcpSM2PremasterSecretGenerator must be "
-        + "initialized using a TlcpSM2PremasterSecretParameterSpec";
+        + "initialized using a TlsRsaPremasterSecretParameterSpec";
 
-    private TlcpSM2PremasterSecretParameterSpec spec;
+    private TlsRsaPremasterSecretParameterSpec spec;
     private SecureRandom random;
 
     protected void engineInit(SecureRandom random) {
@@ -51,11 +51,11 @@ protected void engineInit(SecureRandom random) {
     @SuppressWarnings("deprecation")
     protected void engineInit(AlgorithmParameterSpec params,
             SecureRandom random) throws InvalidAlgorithmParameterException {
-        if (!(params instanceof TlcpSM2PremasterSecretParameterSpec)) {
+        if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
             throw new InvalidAlgorithmParameterException(MSG);
         }
 
-        this.spec = (TlcpSM2PremasterSecretParameterSpec) params;
+        this.spec = (TlsRsaPremasterSecretParameterSpec) params;
         this.random = random;
     }
 

diff --git a/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/SM2KeyExchange.java b/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/SM2KeyExchange.java
@@ -42,7 +42,7 @@
 
 import com.tencent.kona.crypto.CryptoInsts;
 import com.tencent.kona.ssl.SSLInsts;
-import com.tencent.kona.sun.security.internal.spec.TlcpSM2PremasterSecretParameterSpec;
+import com.tencent.kona.sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
 import com.tencent.kona.sun.security.util.KeyUtil;
 
 /**
@@ -90,8 +90,8 @@ static SM2PremasterSecret createPremasterSecret(
                 ClientHandshakeContext chc) throws GeneralSecurityException {
             String algorithm = "TlcpSM2PremasterSecret";
             KeyGenerator kg = SSLInsts.getKeyGenerator(algorithm);
-            TlcpSM2PremasterSecretParameterSpec spec =
-                    new TlcpSM2PremasterSecretParameterSpec(
+            TlsRsaPremasterSecretParameterSpec spec =
+                    new TlsRsaPremasterSecretParameterSpec(
                             chc.clientHelloVersion,
                             chc.negotiatedProtocol.id);
             kg.init(spec, chc.sslContext.getSecureRandom());
@@ -110,7 +110,7 @@ static SM2PremasterSecret decode(ServerHandshakeContext shc,
             try {
                 // Try UNWRAP_MODE mode firstly.
                 cipher.init(Cipher.UNWRAP_MODE, privateKey,
-                        new TlcpSM2PremasterSecretParameterSpec(
+                        new TlsRsaPremasterSecretParameterSpec(
                                 shc.clientHelloVersion,
                                 shc.negotiatedProtocol.id),
                                 shc.sslContext.getSecureRandom());
@@ -201,7 +201,7 @@ private static SecretKey generatePremasterSecret(
                                 ? "SunTls12RsaPremasterSecret"
                                 : "SunTlsRsaPremasterSecret");
                 KeyGenerator kg = CryptoInsts.getKeyGenerator(s);
-                kg.init(new TlcpSM2PremasterSecretParameterSpec(
+                kg.init(new TlsRsaPremasterSecretParameterSpec(
                         clientVersion, serverVersion, encodedSecret),
                         generator);
                 return kg.generateKey();