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

ripping out some proxy stuff that isn't currently in use and is going 

to change anyhow.


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

mod_ssl.h

+0 −21
Changes for mod_ssl.h: 0 added lines, 21 removed lines.
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ 
 * CFLAGS="-DSSL_EXPERIMENTAL_xxxx_IGNORE".

 */

#ifdef SSL_EXPERIMENTAL

#ifndef SSL_EXPERIMENTAL_PROXY_IGNORE

#define SSL_EXPERIMENTAL_PROXY

#endif

#ifdef SSL_ENGINE

#ifndef SSL_EXPERIMENTAL_ENGINE_IGNORE

#define SSL_EXPERIMENTAL_ENGINE
@@ -503,19 +500,6 @@ typedef struct { 
    const char  *szCARevocationPath;

    const char  *szCARevocationFile;

    X509_STORE  *pRevocationStore;

#ifdef SSL_EXPERIMENTAL_PROXY

    /* Configuration details for proxy operation */

    ssl_proto_t  nProxyProtocol;

    int          bProxyVerify;

    int          nProxyVerifyDepth;

    const char  *szProxyCACertificatePath;

    const char  *szProxyCACertificateFile;

    const char  *szProxyClientCertificateFile;

    const char  *szProxyClientCertificatePath;

    const char  *szProxyCipherSuite;

    SSL_CTX     *pSSLProxyCtx;

    STACK_OF(X509_INFO) *skProxyClientCerts;

#endif

} SSLSrvConfigRec;



/*
@@ -701,11 +685,6 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup, 
                         conn_rec *, request_rec *,

                         char *));



/*  Proxy Extensions  */

#if 0 /* XXX */

void         ssl_ext_proxy_register(apr_pool_t *p);

#endif /* -0- */



/*  I/O  */

void         ssl_io_filter_init(conn_rec *, SSL *);

void         ssl_io_filter_register(apr_pool_t *);

ssl_engine_config.c

+0 −24
Changes for ssl_engine_config.c: 0 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -165,18 +165,6 @@ void *ssl_config_server_create(apr_pool_t *p, server_rec *s) 
    sc->szCARevocationFile     = NULL;

    sc->pRevocationStore       = NULL;



#ifdef SSL_EXPERIMENTAL_PROXY

    sc->nProxyVerifyDepth             = UNSET;

    sc->szProxyCACertificatePath      = NULL;

    sc->szProxyCACertificateFile      = NULL;

    sc->szProxyClientCertificateFile  = NULL;

    sc->szProxyClientCertificatePath  = NULL;

    sc->szProxyCipherSuite            = NULL;

    sc->nProxyProtocol                = SSL_PROTOCOL_ALL & ~SSL_PROTOCOL_TLSV1;

    sc->bProxyVerify                  = UNSET;

    sc->pSSLProxyCtx                  = NULL;

#endif



    memset((void*)sc->szPublicCertFiles, 0, sizeof(sc->szPublicCertFiles));

    memset((void*)sc->szPrivateKeyFiles, 0, sizeof(sc->szPrivateKeyFiles));

    memset(sc->pPublicCert,       0, sizeof(sc->pPublicCert));
@@ -224,18 +212,6 @@ void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv) 
        cfgMerge(pPrivateKey[i], NULL);

    }



#ifdef SSL_EXPERIMENTAL_PROXY

    cfgMergeInt(nProxyVerifyDepth);

    cfgMergeString(szProxyCACertificatePath);

    cfgMergeString(szProxyCACertificateFile);

    cfgMergeString(szProxyClientCertificateFile);

    cfgMergeString(szProxyClientCertificatePath);

    cfgMergeString(szProxyCipherSuite);

    cfgMerge(nProxyProtocol, (SSL_PROTOCOL_ALL & ~SSL_PROTOCOL_TLSV1));

    cfgMergeBool(bProxyVerify);

    cfgMerge(pSSLProxyCtx, NULL);

#endif



    return mrg;

}