TKSS-666: Remove TLCPHandshakeHash

Tencent · Feb 5, 2024 · 0bded39 · 0bded39
1 parent c47e737
commit 0bded39
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 89 deletions.
diff --git a/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/CipherSuite.java b/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/CipherSuite.java
@@ -69,19 +69,19 @@ enum CipherSuite {
     TLCP_ECC_SM4_GCM_SM3(
             0xE053, true, "TLCP_ECC_SM4_GCM_SM3", "ECC_SM4_GCM_SM3",
             ProtocolVersion.PROTOCOLS_OF_TLCP,
-            K_SM2, SSLCipher.B_SM4_GCM, M_NULL, H_NONE),
+            K_SM2, SSLCipher.B_SM4_GCM, M_NULL, H_SM3),
     TLCP_ECC_SM4_CBC_SM3(
             0xE013, true, "TLCP_ECC_SM4_CBC_SM3", "ECC_SM4_CBC_SM3",
             ProtocolVersion.PROTOCOLS_OF_TLCP,
-            K_SM2, SSLCipher.B_SM4, M_SM3, H_NONE),
+            K_SM2, SSLCipher.B_SM4, M_SM3, H_SM3),
     TLCP_ECDHE_SM4_GCM_SM3(
             0xE051, true, "TLCP_ECDHE_SM4_GCM_SM3", "ECDHE_SM4_GCM_SM3",
             ProtocolVersion.PROTOCOLS_OF_TLCP,
-            K_SM2E, SSLCipher.B_SM4_GCM, M_NULL, H_NONE),
+            K_SM2E, SSLCipher.B_SM4_GCM, M_NULL, H_SM3),
     TLCP_ECDHE_SM4_CBC_SM3(
             0xE011, true, "TLCP_ECDHE_SM4_CBC_SM3", "ECDHE_SM4_CBC_SM3",
             ProtocolVersion.PROTOCOLS_OF_TLCP,
-            K_SM2E, SSLCipher.B_SM4, M_SM3, H_NONE),
+            K_SM2E, SSLCipher.B_SM4, M_SM3, H_SM3),
 
     // TLS 1.3 cipher suites.
     TLS_AES_256_GCM_SHA384(

diff --git a/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/HandshakeHash.java b/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/HandshakeHash.java
@@ -57,11 +57,10 @@ void determine(ProtocolVersion protocolVersion,
         }
 
         CacheOnlyHash coh = (CacheOnlyHash)transcriptHash;
-        if (protocolVersion.isTLCP11()) {
-            transcriptHash = new TLCPHandshakeHash();
-        } else if (protocolVersion.useTLS13PlusSpec()) {
+        if (protocolVersion.useTLS13PlusSpec()) {
             transcriptHash = new T13HandshakeHash(cipherSuite);
-        } else if (protocolVersion.useTLS12PlusSpec()) {
+        } else if (protocolVersion.useTLS12PlusSpec()
+                || protocolVersion.isTLCP11()) {
             transcriptHash = new T12HandshakeHash(cipherSuite);
         } else if (protocolVersion.useTLS10PlusSpec()) {
             transcriptHash = new T10HandshakeHash(cipherSuite);

diff --git a/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/TLCPHandshakeHash.java b/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/TLCPHandshakeHash.java