Author: markt
Date: Fri Oct 17 09:28:15 2014
New Revision: 1632524
URL: http://svn.apache.org/r1632524
Log:
Remove forcing use of SSLv3 in unit tests
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1632523
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1632524&r1=1632523&r2=1632524&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Fri
Oct 17 09:28:15 2014
@@ -20,10 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.Socket;
import java.net.URISyntaxException;
-import java.net.UnknownHostException;
import java.security.KeyManagementException;
import java.security.KeyStore;
import java.security.NoSuchAlgorithmException;
@@ -33,8 +30,6 @@ import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
@@ -155,12 +150,11 @@ public final class TesterSupport {
protected static void configureClientSsl() {
try {
- SSLContext sc = SSLContext.getInstance("SSL");
+ SSLContext sc = SSLContext.getInstance("TLS");
sc.init(TesterSupport.getUser1KeyManagers(),
TesterSupport.getTrustManagers(),
null);
- javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory(
- new TesterSSLSocketFactory(sc.getSocketFactory()));
+
javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
} catch (Exception e) {
e.printStackTrace();
}
@@ -292,67 +286,4 @@ public final class TesterSupport {
// NOOP - Trust everything
}
}
-
- private static class TesterSSLSocketFactory
- extends SSLSocketFactory {
-
- private SSLSocketFactory factory;
-
- public TesterSSLSocketFactory(SSLSocketFactory factory) {
- this.factory = factory;
- }
-
- @Override
- public String[] getDefaultCipherSuites() {
- return factory.getDefaultCipherSuites();
- }
-
- @Override
- public String[] getSupportedCipherSuites() {
- return factory.getSupportedCipherSuites();
- }
-
- @Override
- public Socket createSocket(Socket socket, String s, int i, boolean
flag)
- throws IOException {
- SSLSocket result =
- (SSLSocket) factory.createSocket(socket, s, i, flag);
- result.setEnabledProtocols(new String[] { "SSLv3" } );
- return result;
- }
-
- @Override
- public Socket createSocket(String s, int i) throws IOException,
- UnknownHostException {
- SSLSocket result = (SSLSocket) factory.createSocket(s, i);
- result.setEnabledProtocols(new String[] { "SSLv3" } );
- return result;
- }
-
- @Override
- public Socket createSocket(String s, int i, InetAddress inetaddress,
- int j) throws IOException, UnknownHostException {
- SSLSocket result =
- (SSLSocket) factory.createSocket(s, i, inetaddress, j);
- result.setEnabledProtocols(new String[] { "SSLv3" } );
- return result;
- }
-
- @Override
- public Socket createSocket(InetAddress inetaddress, int i)
- throws IOException {
- SSLSocket result = (SSLSocket) factory.createSocket(inetaddress,
i);
- result.setEnabledProtocols(new String[] { "SSLv3" } );
- return result;
- }
-
- @Override
- public Socket createSocket(InetAddress inetaddress, int i,
- InetAddress inetaddress1, int j) throws IOException {
- SSLSocket result = (SSLSocket) factory.createSocket(
- inetaddress, i, inetaddress1, j);
- result.setEnabledProtocols(new String[] { "SSLv3" } );
- return result;
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
