Commit 9c0f1eae authored by Doug MacEachern's avatar Doug MacEachern
Browse files

change sc->server references to myCtxConfig, so proxy can use the 

verify callback.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94332 13f79535-47bb-0310-9956-ffa450edef68
parent fff2032a

ssl_engine_kernel.c

+3 −2
Changes for ssl_engine_kernel.c: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1265,6 +1265,7 @@ int ssl_callback_SSLVerify(int ok, X509_STORE_CTX *ctx) 
    SSLSrvConfigRec *sc = mySrvConfig(s);

    SSLDirConfigRec *dc = r ? myDirConfig(r) : NULL;

    SSLConnRec *sslconn = myConnConfig(conn);

    modssl_ctx_t *mctx  = myCtxConfig(sslconn);



    /* Get verify ingredients */

    int errnum   = X509_STORE_CTX_get_error(ctx);
@@ -1301,7 +1302,7 @@ int ssl_callback_SSLVerify(int ok, X509_STORE_CTX *ctx) 
        verify = dc->nVerifyClient;

    }

    else {

        verify = sc->server->auth.verify_mode;

        verify = mctx->auth.verify_mode;

    }



    if (ssl_verify_error_is_optional(errnum) &&
@@ -1344,7 +1345,7 @@ int ssl_callback_SSLVerify(int ok, X509_STORE_CTX *ctx) 
        depth = dc->nVerifyDepth;

    }

    else {

        depth = sc->server->auth.verify_depth;

        depth = mctx->auth.verify_depth;

    }



    if (errdepth > depth) {