Rearrange OpenSSL engine initialization to support RAND

redirection on crypto accelerator.

Submitted by:     Frederic DONNAT <frederic.donnat@zencod.com>
Reviewed by:	  Jeff Trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97482 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a3f3c8b755b4dc87cf5ef20bb795eefff76853a1..939ce60d6eebec6c06110aa2e9e32d38f3e124e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.44
 
+  *) Rearrange OpenSSL engine initialization to support RAND 
+     redirection on crypto accelerator. 
+     [Frederic DONNAT <frederic.donnat@zencod.com>]
+
   *) Always emit Vary header if mod_deflate is involved in the
      request.  [Andre Malo <nd@perlig.de>]
 

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index b387ccc94476db2fc8a462b4ea2387b8fb89a0f4..7a2e74273e031fbe8224cf8eb3ae89efeec2ac34 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -266,6 +266,13 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
 
     }
 
+    /*
+     * SSL external crypto device ("engine") support
+     */
+#ifdef SSL_EXPERIMENTAL_ENGINE
+    ssl_init_Engine(base_server, p);
+#endif
+
     ssl_init_SSLLibrary(base_server);
 
 #if APR_HAS_THREADS
@@ -291,13 +298,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
         return !OK;
     }
 
-    /*
-     * SSL external crypto device ("engine") support
-     */
-#ifdef SSL_EXPERIMENTAL_ENGINE
-    ssl_init_Engine(base_server, p);
-#endif
-
     /*
      * initialize the mutex handling
      */