qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1718893 - in /qpid/java/trunk: broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/ broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/ common/src/main/java/org/apache/qpid/c...
Date Wed, 09 Dec 2015 16:12:57 GMT
Author: rgodfrey
Date: Wed Dec  9 16:12:57 2015
New Revision: 1718893

URL: http://svn.apache.org/viewvc?rev=1718893&view=rev
Log:
QPID-6928 : temporarily re-enable  TLSv1

Modified:
    qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
    qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
    qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
    qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1718893&r1=1718892&r2=1718893&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Wed Dec  9 16:12:57 2015
@@ -375,7 +375,7 @@ public class HttpManagement extends Abst
             throw new IllegalConfigurationException("Key store is not configured. Cannot
start management on HTTPS port without keystore");
         }
         SslContextFactory factory = new SslContextFactory();
-        factory.addExcludeProtocols(SSLUtil.SSLV3_PROTOCOL);
+        factory.addExcludeProtocols(SSLUtil.getExcludedSSlProtocols());
 
         if(port.getDisabledCipherSuites() != null)
         {

Modified: qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java?rev=1718893&r1=1718892&r2=1718893&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
(original)
+++ qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
Wed Dec  9 16:12:57 2015
@@ -120,7 +120,7 @@ class WebSocketProvider implements Accep
         {
             SslContextFactory factory = new SslContextFactory();
             factory.setSslContext(_sslContext);
-            factory.addExcludeProtocols(SSLUtil.SSLV3_PROTOCOL);
+            factory.addExcludeProtocols(SSLUtil.getExcludedSSlProtocols());
             factory.setNeedClientAuth(_port.getNeedClientAuth());
             factory.setWantClientAuth(_port.getWantClientAuth());
             connector = new SslSelectChannelConnector(factory);

Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java?rev=1718893&r1=1718892&r2=1718893&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
(original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
Wed Dec  9 16:12:57 2015
@@ -56,7 +56,7 @@ public class CommonProperties
     public static final int HANDSHAKE_TIMEOUT_DEFAULT = 2;
 
     public static final String DISABLED_SSL_PROTOCOLS = "qpid.disabled_ssl_protocols";
-    public static final String DISABLED_SSL_PROTOCOLS_DEFAULT = "SSLv3,TLSv1";
+    public static final String DISABLED_SSL_PROTOCOLS_DEFAULT = "SSLv3"; //temp removed "SSLv3,TLSv1";
 
     /** The name of the version properties file to load from the class path. */
     public static final String VERSION_RESOURCE = "qpidversion.properties";

Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java?rev=1718893&r1=1718892&r2=1718893&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
(original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
Wed Dec  9 16:12:57 2015
@@ -78,7 +78,6 @@ public class SSLUtil
     private static final Logger LOGGER = LoggerFactory.getLogger(SSLUtil.class);
 
     private static final Integer DNS_NAME_TYPE = 2;
-    public static final String SSLV3_PROTOCOL = "SSLv3";
 
     private SSLUtil()
     {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message