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

mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits

Browse Source 
in the error log to debug level.  [William Rowe]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1447993 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2013-02-20 04:15:18 +00:00
parent a7a919ad86
commit 16a8e81f06
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,6 +1,9 @@
-*- coding: utf-8 -*- -*- coding: utf-8 -*-
Changes with Apache 2.5.0 Changes with Apache 2.5.0
*) mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits
in the error log to debug level. [William Rowe]
*) core: ap_rgetline_core now pulls from r->proto_input_filters. *) core: ap_rgetline_core now pulls from r->proto_input_filters.
*) mod_proxy_html: process parsed comments immediately. *) mod_proxy_html: process parsed comments immediately.

6
modules/ssl/ssl_engine_init.c
View File

@@ -91,7 +91,7 @@ static int ssl_tmp_key_init_rsa(server_rec *s,
if (FIPS_mode() && bits < 1024) { if (FIPS_mode() && bits < 1024) {
mc->pTmpKeys[idx] = NULL; mc->pTmpKeys[idx] = NULL;
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(01877) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01877)
"Init: Skipping generating temporary " "Init: Skipping generating temporary "
"%d bit RSA private key in FIPS mode", bits); "%d bit RSA private key in FIPS mode", bits);
return OK; return OK;
@@ -140,7 +140,7 @@ static int ssl_tmp_key_init_dh(server_rec *s,
if (FIPS_mode() && bits < 1024) { if (FIPS_mode() && bits < 1024) {
mc->pTmpKeys[idx] = NULL; mc->pTmpKeys[idx] = NULL;
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(01880) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01880)
"Init: Skipping generating temporary " "Init: Skipping generating temporary "
"%d bit DH parameters in FIPS mode", bits); "%d bit DH parameters in FIPS mode", bits);
return OK; return OK;
@@ -354,7 +354,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
} }
} }
else { else {
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, APLOGNO(01886) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01886)
"SSL FIPS mode disabled"); "SSL FIPS mode disabled");
} }
#endif #endif