Fine tune support for TLSv1.1 and TLSv1.2 with MySQL 5.5 servers.

risdenk · Nov 23, 2015 · e4a0522 · e4a0522
1 parent f2bc1a8
commit e4a0522
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/com/mysql/jdbc/ExportControlled.java b/src/com/mysql/jdbc/ExportControlled.java
@@ -89,8 +89,8 @@ protected static void transformSocketToSSLSocket(MysqlIO mysqlIO) throws SQLExce
 
             List<String> allowedProtocols = new ArrayList<String>();
             List<String> supportedProtocols = Arrays.asList(((SSLSocket) mysqlIO.mysqlConnection).getSupportedProtocols());
-            for (String protocol : (Util.isEnterpriseEdition(mysqlIO.getServerVersion()) ? new String[] { "TLSv1.2", "TLSv1.1", "TLSv1" } : new String[] {
-                    "TLSv1.1", "TLSv1" })) {
+            for (String protocol : (mysqlIO.versionMeetsMinimum(5, 6, 0) && Util.isEnterpriseEdition(mysqlIO.getServerVersion()) ? new String[] { "TLSv1.2",
+                    "TLSv1.1", "TLSv1" } : new String[] { "TLSv1.1", "TLSv1" })) {
                 if (supportedProtocols.contains(protocol)) {
                     allowedProtocols.add(protocol);
                 }