Author: markt
Date: Fri Mar 25 11:58:51 2011
New Revision: 1085340
URL: http://svn.apache.org/viewvc?rev=1085340&view=rev
Log:
No need to specify a default
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1085340&r1=1085339&r2=1085340&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Fri Mar 25
11:58:51 2011
@@ -97,8 +97,7 @@ public class TestSsl extends TomcatBaseT
tomcat.start();
SSLContext sslCtx = SSLContext.getInstance("TLS");
- sslCtx.init(null, TesterSupport.getTrustManagers(),
- new java.security.SecureRandom());
+ sslCtx.init(null, TesterSupport.getTrustManagers(), null);
SSLSocketFactory socketFactory = sslCtx.getSocketFactory();
SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost",
getPort());
@@ -161,8 +160,7 @@ public class TestSsl extends TomcatBaseT
tomcat.start();
SSLContext sslCtx = SSLContext.getInstance("TLS");
- sslCtx.init(null, TesterSupport.getTrustManagers(),
- new java.security.SecureRandom());
+ sslCtx.init(null, TesterSupport.getTrustManagers(), null);
SSLSocketFactory socketFactory = sslCtx.getSocketFactory();
SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost",
getPort());
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1085340&r1=1085339&r2=1085340&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Fri Mar 25
11:58:51 2011
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.security.KeyManagementException;
import java.security.KeyStore;
import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
import java.security.cert.X509Certificate;
import javax.net.ssl.KeyManager;
@@ -56,7 +55,7 @@ public final class TesterSupport {
SSLContext context;
try {
context = SSLContext.getInstance("TLS");
- context.init(null, null, new SecureRandom());
+ context.init(null, null, null);
SSLServerSocketFactory ssf = context.getServerSocketFactory();
String ciphers[] = ssf.getSupportedCipherSuites();
for (String cipher : ciphers) {
@@ -133,7 +132,7 @@ public final class TesterSupport {
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(TesterSupport.getUser1KeyManagers(),
TesterSupport.getTrustManagers(),
- new java.security.SecureRandom());
+ null);
javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory(
sc.getSocketFactory());
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
