commit d50617333ff52385e3316e11b135a57d1b0859b6
author Alex Rudyy <orudyy@apache.org> Sun Sep 29 22:03:36 2019 +0100
committer Alex Rudyy <orudyy@apache.org> Sun Sep 29 22:03:36 2019 +0100
tree 5a5a3a1d44df3d24ee529466192332709c2f1b46
parent a10dd9eb75bee0ec13cab38e8291a2498583bbdc

QPID-8353: [JMS AMQP 0-x] Add TLSv1.3 into preferences

client/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java

diff --git a/client/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java b/client/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
index a204d2b..566fd01 100644
--- a/client/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
+++ b/client/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
@@ -75,7 +75,7 @@
     private static final Logger LOGGER = LoggerFactory.getLogger(SSLUtil.class);
 
     private static final Integer DNS_NAME_TYPE = 2;
-    public static final String[] TLS_PROTOCOL_PREFERENCES = new String[]{"TLSv1.2", "TLSv1.1", "TLS", "TLSv1"};
+    public static final String[] TLS_PROTOCOL_PREFERENCES = new String[]{"TLSv1.3", "TLSv1.2", "TLSv1.1", "TLS", "TLSv1"};
 
     private static final Method SSL_PARAMETERS_SET_USE_CIPHER_SUITES_ORDER;
 

client/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java

diff --git a/client/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java b/client/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
index eab531d..e5390ec 100644
--- a/client/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
+++ b/client/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
@@ -53,9 +53,9 @@
     {
         List<String> whiteList = Arrays.asList("TLSv1\\.[0-9]+");
         List<String> blackList = Collections.emptyList();
-        String[] enabled = {"TLS", "TLSv1.1", "TLSv1.2"};
-        String[] expected = {"TLSv1.1", "TLSv1.2"};
-        String[] supported = {"SSLv3", "TLS", "TLSv1", "TLSv1.1", "TLSv1.2"};
+        String[] enabled = {"TLS", "TLSv1.1", "TLSv1.2", "TLSv1.3"};
+        String[] expected = {"TLSv1.1", "TLSv1.2", "TLSv1.3"};
+        String[] supported = {"SSLv3", "TLS", "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"};
         String[] result = SSLUtil.filterEntries(enabled, supported, whiteList, blackList);
         assertTrue("unexpected filtered list: expected " + Arrays.toString(expected) + " actual " + Arrays.toString(
                 result), Arrays.equals(expected, result));
@@ -65,9 +65,9 @@
     {
         List<String> whiteList = Arrays.asList();
         List<String> blackList = Arrays.asList("TLSv1\\.[0-9]+");
-        String[] enabled = {"TLS", "TLSv1.1", "TLSv1.2"};
+        String[] enabled = {"TLS", "TLSv1.1", "TLSv1.2", "TLSv1.3"};
         String[] expected = {"TLS"};
-        String[] supported = {"SSLv3", "TLS", "TLSv1", "TLSv1.1", "TLSv1.2"};
+        String[] supported = {"SSLv3", "TLS", "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"};
         String[] result = SSLUtil.filterEntries(enabled, supported, whiteList, blackList);
         assertTrue("unexpected filtered list: expected " + Arrays.toString(expected) + " actual " + Arrays.toString(
                 result), Arrays.equals(expected, result));