Commit 5570141b authored by Stefan Eissing's avatar Stefan Eissing
Browse files

adding revisions after review by jorton 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/tlsv1.3-for-2.4.x@1840530 13f79535-47bb-0310-9956-ffa450edef68
parent d5943f3e

modules/ssl/ssl_engine_kernel.c

+20 −20
Original line number Original line Diff line number Diff line
@@ -431,7 +431,7 @@ static void ssl_configure_env(request_rec *r, SSLConnRec *sslconn) 
}

}





static int ssl_check_post_client_verify(request_rec *r, SSLSrvConfigRec *sc, 

static int ssl_check_post_client_verify(request_rec *r, SSLSrvConfigRec *sc, 

                                        SSLDirConfigRec *dc, SSLConnRec *sslconn, SSL *ssl)

                                        SSLDirConfigRec *dc, SSL *ssl)

{

{

    /*

    /*

     * Finally check for acceptable renegotiation results

     * Finally check for acceptable renegotiation results
@@ -1031,7 +1031,7 @@ static int ssl_hook_Access_classic(request_rec *r, SSLSrvConfigRec *sc, SSLDirCo 
        /*

        /*

         * Finally check for acceptable renegotiation results

         * Finally check for acceptable renegotiation results

         */

         */

        if (OK != (rc = ssl_check_post_client_verify(r, sc, dc, sslconn, ssl))) {

        if (OK != (rc = ssl_check_post_client_verify(r, sc, dc, ssl))) {

            return rc;

            return rc;

        }

        }
@@ -1168,7 +1168,7 @@ static int ssl_hook_Access_modern(request_rec *r, SSLSrvConfigRec *sc, SSLDirCon 
                || (!(vmode_inplace   & SSL_VERIFY_PEER) 

                || (!(vmode_inplace   & SSL_VERIFY_PEER) 

                    && (vmode_needed  & SSL_VERIFY_PEER))

                    && (vmode_needed  & SSL_VERIFY_PEER))

                || (!(vmode_inplace   & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) 

                || (!(vmode_inplace   & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) 

                    && (vmode_inplace & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))) {

                    && (vmode_needed & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))) {

                /* need to change the effective verify mode */

                /* need to change the effective verify mode */

                change_vmode = TRUE;

                change_vmode = TRUE;

            }

            }
@@ -1238,7 +1238,7 @@ static int ssl_hook_Access_modern(request_rec *r, SSLSrvConfigRec *sc, SSLDirCon 
            /*

            /*

             * Finally check for acceptable renegotiation results

             * Finally check for acceptable renegotiation results

             */

             */

            if (OK != (rc = ssl_check_post_client_verify(r, sc, dc, sslconn, ssl))) {

            if (OK != (rc = ssl_check_post_client_verify(r, sc, dc, ssl))) {

                return rc;

                return rc;

            }

            }

        }

        }