httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl config.m4 ssl_engine_io.c ssl_engine_kernel.c ssl_toolkit_compat.h
Date Mon, 19 May 2003 15:13:19 GMT
wrowe       2003/05/19 08:13:19

  Modified:    modules/ssl config.m4 ssl_engine_io.c ssl_engine_kernel.c
                        ssl_toolkit_compat.h
  Log:
    Drop SSL_set_state() in favor of a proper SSL_renegotiate() to begin
    rehandshaking the SSL connection, vis-a-vis ApacheSSL.
  
  Revision  Changes    Path
  1.15      +0 -1      httpd-2.0/modules/ssl/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/config.m4,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- config.m4	19 May 2003 14:48:47 -0000	1.14
  +++ config.m4	19 May 2003 15:13:18 -0000	1.15
  @@ -77,7 +77,6 @@
   dnl #  hook module into the Autoconf mechanism (--enable-ssl option)
   APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [
       APACHE_CHECK_SSL_TOOLKIT
  -    AC_CHECK_FUNCS(SSL_set_state)
       AC_CHECK_FUNCS(SSL_set_cert_store)
       AC_CHECK_FUNCS(ENGINE_init)
   ])
  
  
  
  1.108     +1 -1      httpd-2.0/modules/ssl/ssl_engine_io.c
  
  Index: ssl_engine_io.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- ssl_engine_io.c	16 May 2003 21:16:35 -0000	1.107
  +++ ssl_engine_io.c	19 May 2003 15:13:18 -0000	1.108
  @@ -1257,7 +1257,7 @@
       sslconn = myConnConfig(f->c);
       ssl = sslconn->ssl;
   
  -    SSL_set_state(ssl, SSL_ST_ACCEPT);
  +    SSL_renegotiate(ssl);
       SSL_do_handshake(ssl);
   
       if (SSL_get_state(ssl) != SSL_ST_OK) {
  
  
  
  1.93      +1 -1      httpd-2.0/modules/ssl/ssl_engine_kernel.c
  
  Index: ssl_engine_kernel.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- ssl_engine_kernel.c	5 Apr 2003 22:45:28 -0000	1.92
  +++ ssl_engine_kernel.c	19 May 2003 15:13:19 -0000	1.93
  @@ -712,7 +712,7 @@
               ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
                            "Awaiting re-negotiation handshake");
   
  -            SSL_set_state(ssl, SSL_ST_ACCEPT);
  +            SSL_renegotiate(ssl);
               SSL_do_handshake(ssl);
   
               if (SSL_get_state(ssl) != SSL_ST_OK) {
  
  
  
  1.34      +0 -6      httpd-2.0/modules/ssl/ssl_toolkit_compat.h
  
  Index: ssl_toolkit_compat.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_toolkit_compat.h,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ssl_toolkit_compat.h	19 May 2003 14:48:47 -0000	1.33
  +++ ssl_toolkit_compat.h	19 May 2003 15:13:19 -0000	1.34
  @@ -103,8 +103,6 @@
   #define SSL_get_state(ssl) SSL_state(ssl)
   #endif
   
  -#define SSL_set_state(ssl,val) (ssl)->state = val
  -
   #define MODSSL_BIO_CB_ARG_TYPE const char
   #define MODSSL_CRYPTO_CB_ARG_TYPE const char
   #if (OPENSSL_VERSION_NUMBER < 0x00907000)
  @@ -182,10 +180,6 @@
   
   #define modssl_PEM_read_bio_PrivateKey(b, k, cb, arg) \
      PEM_read_bio_PrivateKey(b, k, cb)
  -
  -#ifndef HAVE_SSL_SET_STATE
  -#define SSL_set_state(ssl, state) /* XXX: should throw an error */
  -#endif
   
   #define modssl_set_cipher_list(ssl, l) \
      SSL_set_cipher_list(ssl, (char *)l)
  
  
  

Mime
View raw message