Repository: activemq Updated Branches: refs/heads/activemq-5.12.x 8daf6f503 -> 0ac1e23d0 refs/heads/activemq-5.13.x a4845253d -> 6e2252d08
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. (cherry picked from commit 315147c5ef3d545a868c74fe55d8ea7efb09f1d1) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6e2252d0 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6e2252d0 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6e2252d0 Branch: refs/heads/activemq-5.13.x Commit: 6e2252d08358f6dc2b0647587930459ead782899 Parents: a484525 Author: Timothy Bish <tabish...@gmail.com> Authored: Mon Dec 7 12:27:11 2015 -0500 Committer: Timothy Bish <tabish...@gmail.com> Committed: Mon Dec 7 12:28:54 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/6e2252d0/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&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>
