mirror of
https://github.com/apache/httpd.git
synced 2025-07-30 20:03:10 +03:00
Forward port of changes in mod_ssl for Apache 1.3 up through mod_ssl
version 2.8.7-1.3.23. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93564 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@ -221,7 +221,11 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
|
||||
|
||||
/*
|
||||
* Seed the Pseudo Random Number Generator (PRNG)
|
||||
*
|
||||
* Note: scoreboard size must be fetched at init time because
|
||||
* ap_calc_scoreboard_size() is not threadsafe
|
||||
*/
|
||||
mc->nScoreboardSize = ap_calc_scoreboard_size();
|
||||
ssl_rand_seed(s, p, SSL_RSCTX_STARTUP, "Init: ");
|
||||
|
||||
/*
|
||||
@ -713,7 +717,8 @@ void ssl_init_ConfigureServer(server_rec *s, apr_pool_t *p, SSLSrvConfigRec *sc)
|
||||
}
|
||||
if (SSL_X509_getCN(p, sc->pPublicCert[i], &cp)) {
|
||||
if (apr_is_fnmatch(cp) &&
|
||||
!apr_fnmatch(cp, s->server_hostname, FNM_PERIOD|FNM_CASE_BLIND)) {
|
||||
apr_fnmatch(cp, s->server_hostname,
|
||||
FNM_PERIOD|FNM_CASE_BLIND) == FNM_NOMATCH) {
|
||||
ssl_log(s, SSL_LOG_WARN,
|
||||
"Init: (%s) %s server certificate wildcard CommonName (CN) `%s' "
|
||||
"does NOT match server name!?", cpVHostID,
|
||||
|
Reference in New Issue
Block a user