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 ssl_engine_kernel.c ssl_toolkit_compat.h
Date Wed, 27 Mar 2002 03:02:10 GMT
dougm       02/03/26 19:02:10

  Modified:    modules/ssl ssl_engine_kernel.c ssl_toolkit_compat.h
  Log:
  sslc adds a second, unused param to X509_verify_cert
  
  Revision  Changes    Path
  1.56      +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.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- ssl_engine_kernel.c	27 Mar 2002 01:28:20 -0000	1.55
  +++ ssl_engine_kernel.c	27 Mar 2002 03:02:10 -0000	1.56
  @@ -755,7 +755,7 @@
                                          SSL_get_ex_data_X509_STORE_CTX_idx(),
                                          (char *)ssl);
   
  -            if (!X509_verify_cert(&cert_store_ctx)) {
  +            if (!modssl_X509_verify_cert(&cert_store_ctx)) {
                   ssl_log(r->server, SSL_LOG_ERROR|SSL_ADD_SSLERR, 
                           "Re-negotiation verification step failed");
               }
  
  
  
  1.4       +4 -0      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ssl_toolkit_compat.h	27 Mar 2002 02:53:38 -0000	1.3
  +++ ssl_toolkit_compat.h	27 Mar 2002 03:02:10 -0000	1.4
  @@ -45,6 +45,8 @@
   
   #define MODSSL_BIO_CB_ARG_TYPE const char
   
  +#define modssl_X509_verify_cert(c) X509_verify_cert(c)
  +
   #else /* RSA sslc */
   
   #ifndef STACK_OF
  @@ -52,6 +54,8 @@
   #endif
   
   #define MODSSL_BIO_CB_ARG_TYPE char
  +
  +#define modssl_X509_verify_cert(c) X509_verify_cert(c, NULL)
   
   #if SSLC_VERSION < 0x2000
   
  
  
  

Mime
View raw message