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

Fix BOOL fips handling for UNSET values, and hack a vc compiler warning

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@926000 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2010-03-22 08:47:26 +00:00
parent e178e4b36d
commit f78ddd0f6c
2 changed files with 11 additions and 5 deletions

View File

@@ -233,6 +233,9 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
sc->server->pphrase_dialog_type = SSL_PPTYPE_BUILTIN;
}
if (sc->fips == UNSET) {
sc->fips = FALSE;
}
}
#if APR_HAS_THREADS
@@ -258,7 +261,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
#ifdef HAVE_FIPS
if(sc->fips) {
if (!FIPS_mode())
if (!FIPS_mode()) {
if (FIPS_mode_set(1)) {
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
"Operating in SSL FIPS mode");