tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject svn commit: r602114 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java tomcat/jni/SSL.java
Date Fri, 07 Dec 2007 15:00:02 GMT
Author: jfclere
Date: Fri Dec  7 07:00:01 2007
New Revision: 602114

URL: http://svn.apache.org/viewvc?rev=602114&view=rev
Log:
Don't load the entropy but sets the file the entropy is collected from.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
    tomcat/trunk/java/org/apache/tomcat/jni/SSL.java

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=602114&r1=602113&r2=602114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Fri Dec  7 07:00:01
2007
@@ -205,17 +205,18 @@
              //only once per VM
             return;
         }
-        String methodName = "initialize";
+        String methodName = "randSet";
         Class paramTypes[] = new Class[1];
         paramTypes[0] = String.class;
         Object paramValues[] = new Object[1];
-        paramValues[0] = "on".equalsIgnoreCase(SSLEngine)?null:SSLEngine;
+        paramValues[0] = SSLRandomSeed;
         Class clazz = Class.forName("org.apache.tomcat.jni.SSL");
         Method method = clazz.getMethod(methodName, paramTypes);
         method.invoke(null, paramValues);
+        
 
-        methodName = "randLoad";
-        paramValues[0] = SSLRandomSeed;
+        methodName = "initialize";
+        paramValues[0] = "on".equalsIgnoreCase(SSLEngine)?null:SSLEngine;
         method = clazz.getMethod(methodName, paramTypes);
         method.invoke(null, paramValues);
  

Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=602114&r1=602113&r2=602114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Fri Dec  7 07:00:01 2007
@@ -227,6 +227,12 @@
     public static native int initialize(String engine);
 
     /**
+      * Set source of entropy to use in SSL
+      *  @param filename Filename containing random data
+      */
+    public static native boolean randSet(String filename);
+
+    /**
      * Add content of the file to the PRNG
      * @param filename Filename containing random data.
      *        If null the default file will be tested.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message