Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 0987d4052 -> 48ffa13f1
Backmerging TLS client fix Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/48ffa13f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/48ffa13f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/48ffa13f Branch: refs/heads/3.0.x-fixes Commit: 48ffa13f15e9c8113012edaacb3d0ece63287a8b Parents: 0987d40 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Nov 4 15:33:29 2014 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Nov 4 15:33:29 2014 +0000 ---------------------------------------------------------------------- .../cxf/transport/https_jetty/CXFJettySslSocketConnector.java | 3 --- .../org/apache/cxf/transport/https/HttpsURLConnectionFactory.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/48ffa13f/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java index 39d9953..c43dcab 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java @@ -116,9 +116,6 @@ public class CXFJettySslSocketConnector extends SslSelectChannelConnector { if (!"SSLv3".equals(proto)) { getSslContextFactory().addExcludeProtocols("SSLv3"); } - if (!"SSLv2Hello".equals(proto)) { - getSslContextFactory().addExcludeProtocols("SSLv2Hello"); - } SSLContext context = getCxfSslContextFactory().getProvider() == null ? SSLContext.getInstance(proto) http://git-wip-us.apache.org/repos/asf/cxf/blob/48ffa13f/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java index f95c5a7..4d1ec43 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java @@ -176,7 +176,7 @@ public class HttpsURLConnectionFactory { // The SSLSocketFactoryWrapper enables certain cipher suites // from the policy. socketFactory = new SSLSocketFactoryWrapper(ctx.getSocketFactory(), cipherSuites, - tlsClientParameters.getSecureSocketProtocol()); + protocol); //recalc the hashcode since somet of the above MAY have changed the tlsClientParameters lastTlsHash = tlsClientParameters.hashCode(); } else {
