mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
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
This commit is contained in:
@@ -212,6 +212,9 @@ static int ssl_hook_pre_config(apr_pool_t *pconf,
|
|||||||
apr_pool_t *plog,
|
apr_pool_t *plog,
|
||||||
apr_pool_t *ptemp)
|
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 */
|
/* Register us to handle mod_log_config %c/%x variables */
|
||||||
ssl_var_log_config_register(pconf);
|
ssl_var_log_config_register(pconf);
|
||||||
#if 0 /* XXX */
|
#if 0 /* XXX */
|
||||||
|
@@ -114,7 +114,6 @@ static void ssl_init_SSLLibrary(server_rec *s)
|
|||||||
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
|
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
|
||||||
"Init: Initializing %s library", SSL_LIBRARY_NAME);
|
"Init: Initializing %s library", SSL_LIBRARY_NAME);
|
||||||
|
|
||||||
CRYPTO_malloc_init();
|
|
||||||
SSL_load_error_strings();
|
SSL_load_error_strings();
|
||||||
SSL_library_init();
|
SSL_library_init();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user