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

Fix CVE CAN-2005-2700:

Browse Source 
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Ensure that
renegotiation is performed for a transition from "SSLVerifyClient
optional" to "SSLVerifyClient require".

The boolean "verify_old & SSL_VERIFY_PEER_STRICT" is true if the old
context merely has optional verification configured, since the
definition of SSL_VERIFY_PEER_STRICT is
(SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_PEER).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264800 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2005-08-30 15:57:38 +00:00
parent 19a0d050b0
commit a1e9d51be3
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -2,6 +2,11 @@
Changes with Apache 2.3.0 Changes with Apache 2.3.0
[Remove entries to the current 2.0 and 2.2 section below, when backported] [Remove entries to the current 2.0 and 2.2 section below, when backported]
*) SECURITY: CAN-2005-2700 (cve.mitre.org)
mod_ssl: Fix a security issue where "SSLVerifyClient" was not
enforced in per-location context if "SSLVerifyClient optional"
was configured in the vhost configuration. [Joe Orton]
*) mod_cgid: run the get_suexec_identity hook within the request-handler *) mod_cgid: run the get_suexec_identity hook within the request-handler
instead of within cgid. PR36410. [Colm MacCarthaigh] instead of within cgid. PR36410. [Colm MacCarthaigh]

4
modules/ssl/ssl_engine_kernel.c
View File

@@ -406,8 +406,8 @@ int ssl_hook_Access(request_rec *r)
(!(verify_old & SSL_VERIFY_PEER) && (!(verify_old & SSL_VERIFY_PEER) &&
(verify & SSL_VERIFY_PEER)) || (verify & SSL_VERIFY_PEER)) ||
(!(verify_old & SSL_VERIFY_PEER_STRICT) && (!(verify_old & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) &&
(verify & SSL_VERIFY_PEER_STRICT))) (verify & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)))
{ {
renegotiate = TRUE; renegotiate = TRUE;
/* optimization */ /* optimization */