After introducing tests in the cmds, we lose the absolute authority

  of the CRYPTO_malloc_init() which must happen the moment we load the
  module and prior to *any* ssl library fn invocation.

  Moved the CRYPTO_malloc_init() into the ssl_register_hooks() function,
  the absolute first call made into any loaded module.

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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 9aa52a99dd2184f35452ae0ceb634a2b56e49f01..6a8062a9f68382b759ee4fcb9d7b5e647cdb68a2 100644 (file)
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -212,6 +212,9 @@ static int ssl_hook_pre_config(apr_pool_t *pconf,
                                apr_pool_t *plog,
                                apr_pool_t *ptemp)
 {
+    /* Preregister the malloc callbacks so cmds can make library calls */
+    CRYPTO_malloc_init();
+
     /* Register us to handle mod_log_config %c/%x variables */
     ssl_var_log_config_register(pconf);
 #if 0 /* XXX */

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 402ce0cbf4be97c113ba60a0935530e3c58a9044..45dec921805d5c3de1c118289d863da6191e7f02 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -114,7 +114,6 @@ static void ssl_init_SSLLibrary(server_rec *s)
     ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
                  "Init: Initializing %s library", SSL_LIBRARY_NAME);
 
-    CRYPTO_malloc_init();
     SSL_load_error_strings();
     SSL_library_init();
 }