www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

* modules/ssl/ssl_engine_init.c (ssl_init_Module): Avoid some bogus

Browse Source 
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
This commit is contained in:
Joe Orton
2020-02-14 08:53:21 +00:00
parent 85760859ca
commit 4d3e6a7750
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/ssl/ssl_engine_init.c
View File

@@ -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: "); ssl_rand_seed(base_server, ptemp, SSL_RSCTX_STARTUP, "Init: ");
#ifdef HAVE_FIPS #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 (sc->fips) {
if (!FIPS_mode()) { if (!FIPS_mode()) {
if (FIPS_mode_set(1)) { 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"); "Operating in SSL FIPS mode");
apr_pool_cleanup_register(p, NULL, modssl_fips_cleanup, apr_pool_cleanup_register(p, NULL, modssl_fips_cleanup,
apr_pool_cleanup_null); apr_pool_cleanup_null);
} }
else { else {
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01885) "FIPS mode failed"); ap_log_error(APLOG_MARK, APLOG_EMERG, 0, base_server, APLOGNO(01885) "FIPS mode failed");
ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, s); ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, base_server);
return ssl_die(s); return ssl_die(base_server);
} }
} }
} }
else { 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"); "SSL FIPS mode disabled");
} }
#endif #endif