Commit b2a99e3b authored by Doug MacEachern's avatar Doug MacEachern
Browse files

move c->notes.ssl::verify::depth to SSLConnRec.verify_depth 

note: may actually be removed unless somebody can figure out why it is in
there to begin with
PR:
Obtained from:
Submitted by:
Reviewed by:


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

mod_ssl.c

+0 −1
Changes for mod_ssl.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -274,7 +274,6 @@ static int ssl_hook_pre_connection(conn_rec *c) 
    SSL_set_app_data(ssl, c);

    apctx = apr_table_make(c->pool, AP_CTX_MAX_ENTRIES);

    apr_table_setn(apctx, "ssl::request_rec", NULL);

    apr_table_setn(apctx, "ssl::verify::depth", AP_CTX_NUM2PTR(0));

    SSL_set_app_data2(ssl, apctx);



    sslconn->ssl = ssl;

mod_ssl.h

+1 −0
Changes for mod_ssl.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ typedef struct { 
    ssl_shutdown_type_e shutdown_type;

    const char *verify_info;

    const char *verify_error;

    int verify_depth;

} SSLConnRec;



typedef struct {

ssl_engine_kernel.c

+5 −9
Changes for ssl_engine_kernel.c: 5 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -371,11 +371,9 @@ int ssl_hook_Access(request_rec *r) 
    STACK_OF(SSL_CIPHER) *skCipherOld;

    STACK_OF(SSL_CIPHER) *skCipher;

    SSL_CIPHER *pCipher;

    apr_table_t *apctx;

    int nVerifyOld;

    int nVerify;

    int n;

    void *vp;

    int rc;



    dc  = myDirConfig(r);
@@ -522,13 +520,11 @@ int ssl_hook_Access(request_rec *r) 
     * restriction on the certificate chain).

     */

    if (dc->nVerifyDepth != UNSET) {

        apctx = (apr_table_t *)SSL_get_app_data2(ssl);

        if ((vp = (void *)apr_table_get(apctx, "ssl::verify::depth")) != NULL)

            n = (int)AP_CTX_PTR2NUM(vp);

        else

            n = sc->nVerifyDepth;

        apr_table_setn(apctx, "ssl::verify::depth",

                   (const char *)AP_CTX_NUM2PTR(dc->nVerifyDepth));

        /* XXX: doesnt look like sslconn->verify_depth is actually used */

        if (!(n = sslconn->verify_depth)) {

            sslconn->verify_depth = n = sc->nVerifyDepth;

        }



        /* determine whether a renegotiation has to be forced */

        if (dc->nVerifyDepth < n) {

            renegotiate = TRUE;