Forward port patch for CAN-2003-0192 from 2.0.

SECURITY [CAN-2003-0192]: Fixed a bug whereby certain sequences
of per-directory renegotiations and the SSLCipherSuite directive
being used to upgrade from a weak ciphersuite to a strong one
could result in the weak ciphersuite being used in place of the
strong one.  [Ben Laurie]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100518 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index e372321131f307783cfe95ef7b611dcc7aaa15f8..aeb0c52b35918c6ac36aead95c233eaec8076f4b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -169,6 +169,12 @@ Changes with Apache 2.0.48
 
 Changes with Apache 2.0.47
 
+  *) SECURITY [CAN-2003-0192]: Fixed a bug whereby certain sequences
+     of per-directory renegotiations and the SSLCipherSuite directive
+     being used to upgrade from a weak ciphersuite to a strong one
+     could result in the weak ciphersuite being used in place of the
+     strong one.  [Ben Laurie]
+
   *) SECURITY [CAN-2003-0253]: Fixed a bug in prefork MPM causing
      temporary denial of service when accept() on a rarely accessed port
      returns certain errors.  Reported by Saheed Akhtar

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 3d2c7de421bb370e93e5e0cc9e4b5943402497f7..18c987c10d7971d63310250825046ac0e592ca3c 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -442,7 +442,7 @@ int ssl_hook_Access(request_rec *r)
         SSL_set_verify_result(ssl, X509_V_OK);
 
         /* determine whether we've to force a renegotiation */
-        if (verify != verify_old) {
+        if (!renegotiate && verify != verify_old) {
             if (((verify_old == SSL_VERIFY_NONE) &&
                  (verify     != SSL_VERIFY_NONE)) ||