httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.c mod_ssl.h ssl_engine_config.c
Date Fri, 29 Mar 2002 02:43:33 GMT
dougm       02/03/28 18:43:33

  Modified:    modules/ssl mod_ssl.c mod_ssl.h ssl_engine_config.c
  Log:
  enable proxy directives
  
  Revision  Changes    Path
  1.55      +0 -2      httpd-2.0/modules/ssl/mod_ssl.c
  
  Index: mod_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- mod_ssl.c	28 Mar 2002 18:50:07 -0000	1.54
  +++ mod_ssl.c	29 Mar 2002 02:43:33 -0000	1.55
  @@ -151,7 +151,6 @@
                   "Enable or disable various SSL protocols"
                   "(`[+-][SSLv2|SSLv3|TLSv1] ...' - see manual)")
   
  -#ifdef SSL_EXPERIMENTAL_PROXY
       /* 
        * Proxy configuration for remote SSL connections
        */
  @@ -179,7 +178,6 @@
       SSL_CMD_SRV(ProxyMachineCertificatePath, TAKE1,
                  "SSL Proxy: directory containing client certificates "
                  "(`/path/to/dir' - contains PEM encoded certificates)")
  -#endif
   
       /*
        * Per-directory context configuration directives
  
  
  
  1.103     +9 -10     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.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- mod_ssl.h	28 Mar 2002 18:58:06 -0000	1.102
  +++ mod_ssl.h	29 Mar 2002 02:43:33 -0000	1.103
  @@ -587,16 +587,15 @@
   const char  *ssl_cmd_SSLOptions(cmd_parms *, void *, const char *);
   const char  *ssl_cmd_SSLRequireSSL(cmd_parms *, void *);
   const char  *ssl_cmd_SSLRequire(cmd_parms *, void *, const char *);
  -#ifdef SSL_EXPERIMENTAL_PROXY
  -const char  *ssl_cmd_SSLProxyProtocol(cmd_parms *, char *, const char *);
  -const char  *ssl_cmd_SSLProxyCipherSuite(cmd_parms *, char *, char *);
  -const char  *ssl_cmd_SSLProxyVerify(cmd_parms *, char *, int);
  -const char  *ssl_cmd_SSLProxyVerifyDepth(cmd_parms *, char *, char *);
  -const char  *ssl_cmd_SSLProxyCACertificatePath(cmd_parms *, char *, char *);
  -const char  *ssl_cmd_SSLProxyCACertificateFile(cmd_parms *, char *, char *);
  -const char  *ssl_cmd_SSLProxyMachineCertificatePath(cmd_parms *, char *, char *);
  -const char  *ssl_cmd_SSLProxyMachineCertificateFile(cmd_parms *, char *, char *);
  -#endif
  +
  +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_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 *);
  +const char  *ssl_cmd_SSLProxyMachineCertificatePath(cmd_parms *, void *, const char *);
  +const char  *ssl_cmd_SSLProxyMachineCertificateFile(cmd_parms *, void *, const char *);
   
   /*  module initialization  */
   int          ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);
  
  
  
  1.59      +29 -27    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.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- ssl_engine_config.c	29 Mar 2002 02:00:20 -0000	1.58
  +++ ssl_engine_config.c	29 Mar 2002 02:43:33 -0000	1.59
  @@ -1228,7 +1228,8 @@
       return NULL;
   }
   
  -const char *ssl_cmd_SSLProtocol(cmd_parms *cmd, void *ctx,
  +const char *ssl_cmd_SSLProtocol(cmd_parms *cmd,
  +                                void *dcfg,
                                   const char *opt)
   {
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
  @@ -1236,38 +1237,40 @@
       return ssl_cmd_protocol_parse(cmd, opt, &sc->server->protocol);
   }
   
  -#ifdef SSL_EXPERIMENTAL_PROXY
  -
  -const char *ssl_cmd_SSLProxyProtocol(cmd_parms *cmd, char *struct_ptr,
  -                                     const char *opt)
  +const char *ssl_cmd_SSLProxyProtocol(cmd_parms *cmd, 
  +                                     void *dcfg,
  +                                     const char *arg)
   {
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
   
  -    return ssl_cmd_protocol_parse(cmd, opt, &sc->nProxyProtocol);
  +    return ssl_cmd_protocol_parse(cmd, arg, &sc->proxy->protocol);
   }
   
  -const char *ssl_cmd_SSLProxyCipherSuite(cmd_parms *cmd, char *struct_ptr,
  -                                        char *arg)
  +const char *ssl_cmd_SSLProxyCipherSuite(cmd_parms *cmd,
  +                                        void *dcfg,
  +                                        const char *arg)
   {
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
   
  -    sc->szProxyCipherSuite = arg;
  +    sc->proxy->auth.cipher_suite = arg;
   
       return NULL;
   }
   
  -const char *ssl_cmd_SSLProxyVerify(cmd_parms *cmd, char *struct_ptr,
  +const char *ssl_cmd_SSLProxyVerify(cmd_parms *cmd,
  +                                   void *dcfg,
                                      int flag)
   {
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
   
  -    sc->bProxyVerify = flag ? TRUE : FALSE;
  +    sc->proxy->auth.verify_mode = flag ? TRUE : FALSE;
   
       return NULL;
   }
   
  -const char *ssl_cmd_SSLProxyVerifyDepth(cmd_parms *cmd, char *struct_ptr,
  -                                        char *arg)
  +const char *ssl_cmd_SSLProxyVerifyDepth(cmd_parms *cmd,
  +                                        void *dcfg,
  +                                        const char *arg)
   {
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       int depth;
  @@ -1277,14 +1280,14 @@
           return err;
       }
   
  -    sc->nProxyVerifyDepth = depth;
  +    sc->proxy->auth.verify_depth = depth;
   
       return NULL;
   }
   
   const char *ssl_cmd_SSLProxyCACertificateFile(cmd_parms *cmd,
  -                                              char *struct_ptr,
  -                                              char *arg)
  +                                              void *dcfg,
  +                                              const char *arg)
   {
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       const char *err;
  @@ -1293,14 +1296,14 @@
           return err;
       }
   
  -    sc->szProxyCACertificateFile = arg;
  +    sc->proxy->auth.ca_cert_file = arg;
   
       return NULL;
   }
   
   const char *ssl_cmd_SSLProxyCACertificatePath(cmd_parms *cmd,
  -                                              char *struct_ptr,
  -                                              char *arg)
  +                                              void *dcfg,
  +                                              const char *arg)
   {
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       const char *err;
  @@ -1309,14 +1312,14 @@
           return err;
       }
   
  -    sc->szProxyCACertificatePath = arg;
  +    sc->proxy->auth.ca_cert_path = arg;
   
       return NULL;
   }
   
   const char *ssl_cmd_SSLProxyMachineCertificateFile(cmd_parms *cmd,
  -                                                   char *struct_ptr,
  -                                                   char *arg)
  +                                                   void *dcfg,
  +                                                   const char *arg)
   {
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       const char *err;
  @@ -1325,14 +1328,14 @@
           return err;
       }
   
  -    sc->szProxyClientCertificateFile = arg;
  +    sc->proxy->pkp->cert_file = arg;
   
       return NULL;
   }
   
   const char *ssl_cmd_SSLProxyMachineCertificatePath(cmd_parms *cmd,
  -                                                   char *struct_ptr,
  -                                                   char *arg)
  +                                                   void *dcfg,
  +                                                   const char *arg)
   {
       SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
       const char *err;
  @@ -1341,10 +1344,9 @@
           return err;
       }
   
  -    sc->szProxyClientCertificatePath = arg;
  +    sc->proxy->pkp->cert_file = arg;
   
       return NULL;
   }
   
  -#endif /* SSL_EXPERIMENTAL_PROXY */
   
  
  
  

Mime
View raw message