You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/09/13 05:02:11 UTC
svn commit: r694870 - in /cxf/branches/2.1.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
Author: dkulp
Date: Fri Sep 12 20:02:11 2008
New Revision: 694870
URL: http://svn.apache.org/viewvc?rev=694870&view=rev
Log:
Merged revisions 694869 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r694869 | dkulp | 2008-09-12 23:00:52 -0400 (Fri, 12 Sep 2008) | 3 lines
Update SSL stuff to work with 1.6.0u10
Pass protocol into factorywrapper to setup the socket correctly
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 20:02:11 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java?rev=694870&r1=694869&r2=694870&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java Fri Sep 12 20:02:11 2008
@@ -205,7 +205,8 @@
// The SSLSocketFactoryWrapper enables certain cipher suites
// from the policy.
socketFactory = new SSLSocketFactoryWrapper(ctx.getSocketFactory(),
- cipherSuites);
+ cipherSuites,
+ tlsClientParameters.getSecureSocketProtocol());
}
if (tlsClientParameters.isDisableCNCheck()) {
connection.setHostnameVerifier(DISABLE_HOSTNAME_VERIFIER);
Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java?rev=694870&r1=694869&r2=694870&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java Fri Sep 12 20:02:11 2008
@@ -39,13 +39,16 @@
private SSLSocketFactory sslSocketFactory;
private String[] ciphers;
+ private String protocol;
public SSLSocketFactoryWrapper(
SSLSocketFactory sslSocketFactoryParam,
- String[] ciphersParam
+ String[] ciphersParam,
+ String protocolParam
) {
sslSocketFactory = sslSocketFactoryParam;
ciphers = ciphersParam;
+ protocol = protocolParam;
}
public String[] getDefaultCipherSuites() {
@@ -55,6 +58,11 @@
public String[] getSupportedCipherSuites() {
return sslSocketFactory.getSupportedCipherSuites();
}
+
+ public Socket createSocket() throws IOException {
+ return enableCipherSuites(sslSocketFactory.createSocket(),
+ new Object[] {"unconnected", "unconnected"});
+ }
public Socket createSocket(Socket s, String host, int port, boolean autoClose)
throws IOException, UnknownHostException {
@@ -90,7 +98,9 @@
if ((socket != null) && (ciphers != null)) {
socket.setEnabledCipherSuites(ciphers);
}
-
+ if ((socket != null) && (protocol != null)) {
+ socket.setEnabledProtocols(new String[] {protocol});
+ }
if (socket == null) {
LogUtils.log(LOG, Level.SEVERE,
"PROBLEM_CREATING_OUTBOUND_REQUEST_SOCKET",