Commit 06aa798f authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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/modules/ssl@98252 13f79535-47bb-0310-9956-ffa450edef68
parent 3ba9635f

mod_ssl.c

+3 −0
Original line number Diff line number Diff line
@@ -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 */

ssl_engine_init.c

+0 −1
Original line number Diff line number Diff line
@@ -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();

}