From 1ef7d9ac6ea2ca89073d41c3a72dc8336f88ffc1 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 25 Mar 2011 11:58:51 +0000 Subject: [PATCH] No need to specify a default 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 | 6 ++---- test/org/apache/tomcat/util/net/TesterSupport.java | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/test/org/apache/tomcat/util/net/TestSsl.java b/test/org/apache/tomcat/util/net/TestSsl.java index 37c5e931d..e564927fb 100644 --- a/test/org/apache/tomcat/util/net/TestSsl.java +++ b/test/org/apache/tomcat/util/net/TestSsl.java @@ -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()); diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java b/test/org/apache/tomcat/util/net/TesterSupport.java index d918367a6..5564d506e 100644 --- a/test/org/apache/tomcat/util/net/TesterSupport.java +++ b/test/org/apache/tomcat/util/net/TesterSupport.java @@ -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) { -- 2.11.0