Author: dkulp Date: Fri Sep 12 20:19:22 2008 New Revision: 694871 URL: http://svn.apache.org/viewvc?rev=694871&view=rev Log: Merged revisions 694870 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r694870 | dkulp | 2008-09-12 23:02:11 -0400 (Fri, 12 Sep 2008) | 10 lines 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.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 12 20:19:22 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Sep 12 20:19:22 2008 @@ -1 +1 @@ -/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,691745,692162-692163,692344,692468,692500,694466-694469,694472,694717,694748-694749 +/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,691745,692162-692163,692344,692468,692500,694466-694469,694472,694717,694748-694749,694870 Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java?rev=694871&r1=694870&r2=694871&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java Fri Sep 12 20:19:22 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.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java?rev=694871&r1=694870&r2=694871&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java Fri Sep 12 20:19:22 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",
