Repository: activemq
Updated Branches:
  refs/heads/master 913f64476 -> 315147c5e


https://issues.apache.org/jira/browse/AMQ-6074

Make the transportConnector configs consistent across all four variants
by removing the enableCipherSuites option on openwire NIO+SSL.  RC4 was
enabled on the broker side but in later JDK releases that suite is
disbaled as it is insecure so the client side couldn't find a supported
suite.  

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/315147c5
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/315147c5
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/315147c5

Branch: refs/heads/master
Commit: 315147c5ef3d545a868c74fe55d8ea7efb09f1d1
Parents: 913f644
Author: Timothy Bish <[email protected]>
Authored: Mon Dec 7 12:27:11 2015 -0500
Committer: Timothy Bish <[email protected]>
Committed: Mon Dec 7 12:27:34 2015 -0500

----------------------------------------------------------------------
 .../org/apache/activemq/bugs/amq4126/JaasStompSSLBroker.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/315147c5/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq4126/JaasStompSSLBroker.xml
----------------------------------------------------------------------
diff --git 
a/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq4126/JaasStompSSLBroker.xml
 
b/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq4126/JaasStompSSLBroker.xml
index a245028..70af5fa 100644
--- 
a/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq4126/JaasStompSSLBroker.xml
+++ 
b/activemq-unit-tests/src/test/resources/org/apache/activemq/bugs/amq4126/JaasStompSSLBroker.xml
@@ -39,7 +39,7 @@
       <transportConnector name="stomp+ssl" 
uri="stomp+ssl://0.0.0.0:0?transport.needClientAuth=true" />
       <transportConnector name="stomp+nio+ssl" 
uri="stomp+nio+ssl://0.0.0.0:0?transport.needClientAuth=true" />
       <transportConnector name="openwire+ssl" 
uri="ssl://0.0.0.0:0?transport.needClientAuth=true" />
-      <transportConnector name="openwire+nio+ssl" 
uri="nio+ssl://0.0.0.0:0?transport.needClientAuth=true&amp;transport.enabledCipherSuites=SSL_RSA_WITH_RC4_128_SHA,SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"
 />
+      <transportConnector name="openwire+nio+ssl" 
uri="nio+ssl://0.0.0.0:0?transport.needClientAuth=true" />
     </transportConnectors>
 
   </broker>

Reply via email to