From b3ee90c97584cbe6bb5399825e466093e56d9877 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Thu, 16 Oct 2014 16:12:35 +0000 Subject: QPID-6156 : tidy up and ensure that there is no chance of inadvertantly adding an previously unenabled but supported protocol that is not SSLv3 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1632376 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/transport/network/security/ssl/SSLUtil.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'qpid/java/common/src') diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java index 0494f60e23..98229fd2a1 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java @@ -250,10 +250,10 @@ public class SSLUtil public static void removeSSLv3Support(final SSLEngine engine) { - List supportedProtocols = Arrays.asList(engine.getSupportedProtocols()); - if(supportedProtocols.contains(SSLV3_PROTOCOL)) + List enabledProtocols = Arrays.asList(engine.getEnabledProtocols()); + if(enabledProtocols.contains(SSLV3_PROTOCOL)) { - List allowedProtocols = new ArrayList<>(supportedProtocols); + List allowedProtocols = new ArrayList<>(enabledProtocols); allowedProtocols.remove(SSLV3_PROTOCOL); engine.setEnabledProtocols(allowedProtocols.toArray(new String[allowedProtocols.size()])); } @@ -261,10 +261,10 @@ public class SSLUtil public static void removeSSLv3Support(final SSLSocket socket) { - List supportedProtocols = Arrays.asList(socket.getSupportedProtocols()); - if(supportedProtocols.contains(SSLV3_PROTOCOL)) + List enabledProtocols = Arrays.asList(socket.getEnabledProtocols()); + if(enabledProtocols.contains(SSLV3_PROTOCOL)) { - List allowedProtocols = new ArrayList<>(supportedProtocols); + List allowedProtocols = new ArrayList<>(enabledProtocols); allowedProtocols.remove(SSLV3_PROTOCOL); socket.setEnabledProtocols(allowedProtocols.toArray(new String[allowedProtocols.size()])); } @@ -273,10 +273,10 @@ public class SSLUtil public static void removeSSLv3Support(final SSLServerSocket socket) { - List supportedProtocols = Arrays.asList(socket.getSupportedProtocols()); - if(supportedProtocols.contains(SSLV3_PROTOCOL)) + List enabledProtocols = Arrays.asList(socket.getEnabledProtocols()); + if(enabledProtocols.contains(SSLV3_PROTOCOL)) { - List allowedProtocols = new ArrayList<>(supportedProtocols); + List allowedProtocols = new ArrayList<>(enabledProtocols); allowedProtocols.remove(SSLV3_PROTOCOL); socket.setEnabledProtocols(allowedProtocols.toArray(new String[allowedProtocols.size()])); } -- cgit v1.2.1