Author: remy.maucherat(a)jboss.com Date: 2007-12-06 13:16:40 -0500 (Thu, 06 Dec 2007) New Revision: 371 Modified: branches/2.0.x/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java Log: - Add option to configure the random source, and better default. Modified: branches/2.0.x/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 17:49:45 UTC (rev 370) +++ branches/2.0.x/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 18:16:40 UTC (rev 371) @@ -63,6 +63,7 @@ // ---------------------------------------------- Properties protected static String SSLEngine = "on"; //default on + protected static String SSLRandomSeed = "builtin"; protected static boolean sslInitialized = false; protected static boolean aprInitialized = false; @@ -211,6 +212,12 @@ Class clazz = Class.forName("org.apache.tomcat.jni.SSL"); Method method = clazz.getMethod(methodName, paramTypes); method.invoke(null, paramValues); + + methodName = "randLoad"; + paramValues[0] = SSLRandomSeed; + method = clazz.getMethod(methodName, paramTypes); + method.invoke(null, paramValues); + sslInitialized = true; } @@ -222,4 +229,12 @@ this.SSLEngine = SSLEngine; } + public String getSSLRandomSeed() { + return SSLRandomSeed; + } + + public void setSSLRandomSeed(String SSLRandomSeed) { + this.SSLRandomSeed = SSLRandomSeed; + } + } Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 17:49:45 UTC (rev 370) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/AprLifecycleListener.java 2007-12-06 18:16:40 UTC (rev 371) @@ -18,7 +18,9 @@ package org.apache.catalina.core; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; + import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; @@ -27,17 +29,15 @@ import org.apache.commons.logging.LogFactory; import org.apache.tomcat.jni.Library; -import java.lang.reflect.InvocationTargetException; - /** * Implementation of <code>LifecycleListener</code> that will init and * and destroy APR. * * @author Remy Maucherat * @author Filip Hanik - * @version $Revision: 524730 $ $Date: 2007-04-02 08:24:33 +0200 (lun., 02 avr. 2007) $ + * @version $Revision: 534930 $ $Date: 2007-05-03 18:43:35 +0200 (jeu., 03 mai 2007) $ * @since 4.1 */ @@ -64,6 +64,7 @@ // ---------------------------------------------- Properties protected static String SSLEngine = "on"; //default on + protected static String SSLRandomSeed = "builtin"; protected static boolean sslInitialized = false; protected static boolean aprInitialized = false; @@ -212,6 +213,12 @@ Class clazz = Class.forName("org.apache.tomcat.jni.SSL"); Method method = clazz.getMethod(methodName, paramTypes); method.invoke(null, paramValues); + + methodName = "randLoad"; + paramValues[0] = SSLRandomSeed; + method = clazz.getMethod(methodName, paramTypes); + method.invoke(null, paramValues); + sslInitialized = true; } @@ -222,4 +229,13 @@ public void setSSLEngine(String SSLEngine) { this.SSLEngine = SSLEngine; } + + public String getSSLRandomSeed() { + return SSLRandomSeed; + } + + public void setSSLRandomSeed(String SSLRandomSeed) { + this.SSLRandomSeed = SSLRandomSeed; + } + }