mirror of
https://github.com/apache/httpd.git
synced 2025-08-07 04:02:58 +03:00
Solve a pretty horrific bug in SSLCryptoDevice and other places where
the config cmd processors should be examining the SSL context. We must initialize the SSL library before we can actually obtain any useful information from the SSL library. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100107 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -106,18 +106,6 @@ static void ssl_add_version_components(apr_pool_t *p,
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Initialize SSL library
|
||||
*/
|
||||
static void ssl_init_SSLLibrary(server_rec *s)
|
||||
{
|
||||
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
|
||||
"Init: Initializing %s library", SSL_LIBRARY_NAME);
|
||||
|
||||
SSL_load_error_strings();
|
||||
SSL_library_init();
|
||||
}
|
||||
|
||||
/*
|
||||
* Handle the Temporary RSA Keys and DH Params
|
||||
*/
|
||||
@@ -274,12 +262,13 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
|
||||
ssl_init_Engine(base_server, p);
|
||||
#endif
|
||||
|
||||
ssl_init_SSLLibrary(base_server);
|
||||
|
||||
#if APR_HAS_THREADS
|
||||
ssl_util_thread_setup(p);
|
||||
#endif
|
||||
|
||||
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
|
||||
"Init: Initialized %s library", SSL_LIBRARY_NAME);
|
||||
|
||||
/*
|
||||
* Seed the Pseudo Random Number Generator (PRNG)
|
||||
* only need ptemp here; nothing inside allocated from the pool
|
||||
|
Reference in New Issue
Block a user