Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 28 Mar 2002 17:23:50 -0000
Message-ID: <20020328172350.89430.qmail@icarus.apache.org>
From: dougm@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_config.c

dougm       02/03/28 09:23:50

  Modified:    modules/ssl mod_ssl.h ssl_engine_config.c
  Log:
  ripping out some proxy stuff that isn't currently in use and is going
  to change anyhow.
  
  Revision  Changes    Path
  1.98      +0 -21     httpd-2.0/modules/ssl/mod_ssl.h
  
  Index: mod_ssl.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- mod_ssl.h	28 Mar 2002 17:16:41 -0000	1.97
  +++ mod_ssl.h	28 Mar 2002 17:23:50 -0000	1.98
  @@ -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 @@
       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;
   
   /*
  @@ -700,11 +684,6 @@
                           (apr_pool_t *, server_rec *,
                            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 *);
  
  
  
  1.49      +0 -24     httpd-2.0/modules/ssl/ssl_engine_config.c
  
  Index: ssl_engine_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_config.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- ssl_engine_config.c	28 Mar 2002 17:11:12 -0000	1.48
  +++ ssl_engine_config.c	28 Mar 2002 17:23:50 -0000	1.49
  @@ -165,18 +165,6 @@
       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));
  @@ -223,18 +211,6 @@
           cfgMerge(pPublicCert[i], NULL);
           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;
   }