diff options
| author | Joe Orton <jorton@apache.org> | 2020-02-14 09:53:21 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-02-14 09:53:21 +0100 |
| commit | 4d3e6a77500f9009e86ebc759773146e4a5c59d6 (patch) | |
| tree | f5cd4f4aa73d6fef8cdd752cd40b63487484595e /modules/ssl | |
| parent | Fix spelling errors found by codespell. [skip ci] (diff) | |
| download | apache2-4d3e6a77500f9009e86ebc759773146e4a5c59d6.tar.xz apache2-4d3e6a77500f9009e86ebc759773146e4a5c59d6.zip | |
* modules/ssl/ssl_engine_init.c (ssl_init_Module): Avoid some bogus
gcc -Wmaybe-uninitialized warnings in (slightly odd) SSLFIPS
handling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874005 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl')
| -rw-r--r-- | modules/ssl/ssl_engine_init.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index b79cb229a6..e378218be5 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -331,23 +331,26 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, ssl_rand_seed(base_server, ptemp, SSL_RSCTX_STARTUP, "Init: "); #ifdef HAVE_FIPS + /* ### The FIPS setting is global and must be the same in all + * SSLSrvConfigRecs, should be in SSLModConfigRec really. */ + sc = mySrvConfig(base_server); if (sc->fips) { if (!FIPS_mode()) { if (FIPS_mode_set(1)) { - ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(01884) + ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, base_server, APLOGNO(01884) "Operating in SSL FIPS mode"); apr_pool_cleanup_register(p, NULL, modssl_fips_cleanup, apr_pool_cleanup_null); } else { - ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01885) "FIPS mode failed"); - ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, s); - return ssl_die(s); + ap_log_error(APLOG_MARK, APLOG_EMERG, 0, base_server, APLOGNO(01885) "FIPS mode failed"); + ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, base_server); + return ssl_die(base_server); } } } else { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01886) + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, base_server, APLOGNO(01886) "SSL FIPS mode disabled"); } #endif |