No need to specify a default
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Fri, 25 Mar 2011 11:58:51 +0000 (11:58 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Fri, 25 Mar 2011 11:58:51 +0000 (11:58 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1085340 13f79535-47bb-0310-9956-ffa450edef68

test/org/apache/tomcat/util/net/TestSsl.java
test/org/apache/tomcat/util/net/TesterSupport.java

index 37c5e93..e564927 100644 (file)
@@ -97,8 +97,7 @@ public class TestSsl extends TomcatBaseTest {
         
         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 TomcatBaseTest {
         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());
index d918367..5564d50 100644 (file)
@@ -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) {