WL#16353, Refresh the list of acceptable TLS ciphers.

Change-Id: I90420e6a18205e6791915d2a9d0902e1d3cfd266
mysql · Apr 19, 2024 · 9533a6b · 9533a6b
1 parent 22b061b
commit 9533a6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,8 @@
 
 Version 9.0.0
 
+  - WL#16353, Refresh the list of acceptable TLS ciphers.
+
   - Fix for Bug#114687 (Bug#36529541), Tests fail after mysql_native_password has been made optional in server.
 
   - WL#16319, Remove deprecated insensitive terminology based methods.

diff --git a/src/main/resources/com/mysql/cj/TlsSettings.properties b/src/main/resources/com/mysql/cj/TlsSettings.properties
@@ -32,16 +32,16 @@ TLSCiphers.Approved=\
     ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,\
     ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,\
     ECDHE_ECDSA_WITH_AES_256_CCM,\
-    ECDHE_ECDSA_WITH_AES_128_CCM,\
-    DHE_RSA_WITH_AES_128_GCM_SHA256,\
-    DHE_RSA_WITH_AES_256_GCM_SHA384,\
-    DHE_RSA_WITH_AES_256_CCM,\
-    DHE_RSA_WITH_AES_128_CCM,\
-    DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+    ECDHE_ECDSA_WITH_AES_128_CCM
 
 # Deprecated TLS Ciphers
 TLSCiphers.Deprecated=\
     AES_128_CCM_8_SHA256,\
+    DHE_RSA_WITH_AES_128_GCM_SHA256,\
+    DHE_RSA_WITH_AES_256_GCM_SHA384,\
+    DHE_RSA_WITH_AES_256_CCM,\
+    DHE_RSA_WITH_AES_128_CCM,\
+    DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,\
     ECDHE_ECDSA_WITH_AES_256_CCM_8,\
     ECDHE_ECDSA_WITH_AES_128_CCM_8,\
     DHE_RSA_WITH_AES_256_CCM_8,\
@@ -93,6 +93,5 @@ TLSCiphers.Deprecated=\
     ECDH_RSA_WITH_AES_128_GCM_SHA256,\
     ECDH_RSA_WITH_AES_256_GCM_SHA384
 
-
 # Unacceptable TLS Ciphers
 TLSCiphers.Unacceptable.Mask=_ANON_,_NULL_,_EXPORT,_MD5,_DES,_3DES_,_RC2_,_RC4_,_PSK_,_DH_