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

use ssl_cmd_verify_parse for SSLProxyVerify directive handler 


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

mod_ssl.c

+1 −1
Changes for mod_ssl.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static const command_rec ssl_config_cmds[] = { 
    SSL_CMD_SRV(ProxyCipherSuite, TAKE1,

               "SSL Proxy: colon-delimited list of permitted SSL ciphers "

               "(`XXX:...:XXX' - see manual)")

    SSL_CMD_SRV(ProxyVerify, FLAG,

    SSL_CMD_SRV(ProxyVerify, TAKE1,

               "SSL Proxy: whether to verify the remote certificate "

               "(`on' or `off')")

    SSL_CMD_SRV(ProxyVerifyDepth, TAKE1,

mod_ssl.h

+1 −1
Changes for mod_ssl.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ const char *ssl_cmd_SSLRequire(cmd_parms *, void *, const char *); 


const char  *ssl_cmd_SSLProxyProtocol(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLProxyCipherSuite(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLProxyVerify(cmd_parms *, void *, int);

const char  *ssl_cmd_SSLProxyVerify(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLProxyVerifyDepth(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLProxyCACertificatePath(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLProxyCACertificateFile(cmd_parms *, void *, const char *);

ssl_engine_config.c

+12 −6
Changes for ssl_engine_config.c: 12 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -857,18 +857,18 @@ const char *ssl_cmd_SSLVerifyClient(cmd_parms *cmd, 
{

    SSLDirConfigRec *dc = (SSLDirConfigRec *)dcfg;

    SSLSrvConfigRec *sc = mySrvConfig(cmd->server);

    ssl_verify_t id;

    ssl_verify_t mode;

    const char *err;



    if ((err = ssl_cmd_verify_parse(cmd, arg, &id))) {

    if ((err = ssl_cmd_verify_parse(cmd, arg, &mode))) {

        return err;

    }

    

    if (cmd->path) {

        dc->nVerifyClient = id;

        dc->nVerifyClient = mode;

    }

    else {

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

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

    }



    return NULL;
@@ -1279,11 +1279,17 @@ const char *ssl_cmd_SSLProxyCipherSuite(cmd_parms *cmd, 


const char *ssl_cmd_SSLProxyVerify(cmd_parms *cmd,

                                   void *dcfg,

                                   int flag)

                                   const char *arg)

{

    SSLSrvConfigRec *sc = mySrvConfig(cmd->server);

    ssl_verify_t mode;

    const char *err;



    if ((err = ssl_cmd_verify_parse(cmd, arg, &id))) {

        return err;

    }



    sc->proxy->auth.verify_mode = flag ? TRUE : FALSE;

    sc->proxy->auth.verify_mode = mode;



    return NULL;

}