TKSS-660: Remove TLCPCipher

Tencent · Feb 4, 2024 · 9da5a1a · 9da5a1a
1 parent df83c11
commit 9da5a1a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 588 deletions.
diff --git a/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/SSLCipher.java b/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/SSLCipher.java
@@ -62,22 +62,22 @@ enum SSLCipher {
     B_SM4(CIPHER_SM4, BLOCK_CIPHER, 16, 16, 16, 0, true, false,
         new Map.Entry[] {
             new SimpleImmutableEntry<ReadCipherGenerator, ProtocolVersion[]>(
-                new TLCPCipher.TLCPBlockReadCipherGenerator(),
+                new T11BlockReadCipherGenerator(),
                 ProtocolVersion.PROTOCOLS_OF_TLCP)},
         new Map.Entry[] {
             new SimpleImmutableEntry<WriteCipherGenerator, ProtocolVersion[]>(
-                new TLCPCipher.TLCPBlockWriteCipherGenerator(),
+                new T11BlockWriteCipherGenerator(),
                 ProtocolVersion.PROTOCOLS_OF_TLCP)}),
 
     @SuppressWarnings({"unchecked", "rawtypes"})
     B_SM4_GCM(CIPHER_SM4_GCM, AEAD_CIPHER, 16, 16, 12, 4, true, false,
         new Map.Entry[] {
             new SimpleImmutableEntry<ReadCipherGenerator, ProtocolVersion[]>(
-                new TLCPCipher.TLCPGcmReadCipherGenerator(),
+                new T12GcmReadCipherGenerator(),
                 ProtocolVersion.PROTOCOLS_OF_TLCP)},
         new Map.Entry[] {
             new SimpleImmutableEntry<WriteCipherGenerator, ProtocolVersion[]>(
-                new TLCPCipher.TLCPGcmWriteCipherGenerator(),
+                new T12GcmWriteCipherGenerator(),
                 ProtocolVersion.PROTOCOLS_OF_TLCP)}),
 
     @SuppressWarnings({"unchecked", "rawtypes"})

diff --git a/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/TLCPCertificateVerify.java b/kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/TLCPCertificateVerify.java
@@ -159,16 +159,15 @@ public void send(HandshakeOutStream hos) throws IOException {
         public String toString() {
             MessageFormat messageFormat = new MessageFormat(
                     "\"CertificateVerify\": '{'\n" +
-                            "  \"signature algorithm\": {0}\n" +
+                            "  \"signature algorithm\": sm2sig_sm3\n" +
                             "  \"signature\": '{'\n" +
-                            "{1}\n" +
+                            "{0}\n" +
                             "  '}'\n" +
                             "'}'",
                     Locale.ENGLISH);
 
             HexDumpEncoder hexEncoder = new HexDumpEncoder();
             Object[] messageFields = {
-                    "sm2sig_sm3",
                     Utilities.indent(
                             hexEncoder.encodeBuffer(signature), "    ")
             };