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

PR 55616 (add missing APLOGNO), part 2

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1527926 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kaspar Brand
2013-10-01 06:25:35 +00:00
parent 31156ac269
commit 2aa439bdec
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/log-message-tags/next-number
View File

@@ -1 +1 @@
2540 2542

4
modules/ssl/ssl_engine_init.c
View File

@@ -1068,7 +1068,7 @@ static void ssl_init_server_certs(server_rec *s,
if ((mctx->pks->cert_files[0] != NULL) && if ((mctx->pks->cert_files[0] != NULL) &&
(dhparams = ssl_dh_GetParamFromFile(mctx->pks->cert_files[0]))) { (dhparams = ssl_dh_GetParamFromFile(mctx->pks->cert_files[0]))) {
SSL_CTX_set_tmp_dh(mctx->ssl_ctx, dhparams); SSL_CTX_set_tmp_dh(mctx->ssl_ctx, dhparams);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO() ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02540)
"Custom DH parameters (%d bits) for %s loaded from %s", "Custom DH parameters (%d bits) for %s loaded from %s",
BN_num_bits(dhparams->p), vhost_id, BN_num_bits(dhparams->p), vhost_id,
mctx->pks->cert_files[0]); mctx->pks->cert_files[0]);
@@ -1083,7 +1083,7 @@ static void ssl_init_server_certs(server_rec *s,
(nid = EC_GROUP_get_curve_name(ecparams)) && (nid = EC_GROUP_get_curve_name(ecparams)) &&
(eckey = EC_KEY_new_by_curve_name(nid))) { (eckey = EC_KEY_new_by_curve_name(nid))) {
SSL_CTX_set_tmp_ecdh(mctx->ssl_ctx, eckey); SSL_CTX_set_tmp_ecdh(mctx->ssl_ctx, eckey);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO() ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02541)
"ECDH curve %s for %s specified in %s", "ECDH curve %s for %s specified in %s",
OBJ_nid2sn(nid), vhost_id, mctx->pks->cert_files[0]); OBJ_nid2sn(nid), vhost_id, mctx->pks->cert_files[0]);
} }