httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_toolkit_compat.h
Date Fri, 14 Mar 2003 02:20:51 GMT
madhum      2003/03/13 18:20:50

  Modified:    .        CHANGES
               modules/ssl mod_ssl.h ssl_toolkit_compat.h
  Log:
  OpenSSL should be included as "openssl/ssl.h" and not "ssl.h" (and rely on the
  INCLUDE path to be defined properly)
  
  PR: 11310
  Submitted by: Geoff Thrope <geoff@geoffthrope.net>
  Reviewed by: Madhusudan Mathihalli
  
  Revision  Changes    Path
  1.1125    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1124
  retrieving revision 1.1125
  diff -u -r1.1124 -r1.1125
  --- CHANGES	13 Mar 2003 20:53:49 -0000	1.1124
  +++ CHANGES	14 Mar 2003 02:20:49 -0000	1.1125
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) OpenSSL headers should be included as "openssl/ssl.h", and not rely on
  +     the INCLUDE path to be defined properly.
  +     PR 11310. [Geoff Thrope <geoff@geoffthorpe.net>]
  +
     *) Modify APACHE_CHECK_SSL_TOOLKIT to detect SSL-C. [Madhusudan Mathihalli]
        
     *) Replace the APACHE_CHECK_SSL_TOOLKIT method with a cleaner one, using
  
  
  
  1.126     +0 -16     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.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- mod_ssl.h	23 Feb 2003 17:12:43 -0000	1.125
  +++ mod_ssl.h	14 Mar 2003 02:20:50 -0000	1.126
  @@ -107,23 +107,7 @@
   
   #define MOD_SSL_VERSION AP_SERVER_BASEREVISION
   
  -/* OpenSSL headers */
  -#include <ssl.h>
  -#include <err.h>
  -#include <x509.h>
  -#include <pem.h>
  -#include <crypto.h>
  -#include <evp.h>
  -#include <rand.h>
  -#ifdef SSL_EXPERIMENTAL_ENGINE
  -#include <engine.h>
  -#endif
  -
   #include "ssl_toolkit_compat.h"
  -
  -#ifdef HAVE_SSL_X509V3_H
  -#include <x509v3.h>
  -#endif
   
   /* mod_ssl headers */
   #include "ssl_expr.h"
  
  
  
  1.29      +21 -8     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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ssl_toolkit_compat.h	3 Feb 2003 17:53:13 -0000	1.28
  +++ ssl_toolkit_compat.h	14 Mar 2003 02:20:50 -0000	1.29
  @@ -55,7 +55,20 @@
    * between OpenSSL and RSA sslc
    */
   
  -#ifdef OPENSSL_VERSION_NUMBER
  +#ifdef HAVE_OPENSSL
  +
  +/* OpenSSL headers */
  +#include <openssl/ssl.h>
  +#include <openssl/err.h>
  +#include <openssl/x509.h>
  +#include <openssl/pem.h>
  +#include <openssl/crypto.h>
  +#include <openssl/evp.h>
  +#include <openssl/rand.h>
  +#include <openssl/x509v3.h>
  +#ifdef SSL_EXPERIMENTAL_ENGINE
  +#include <openssl/engine.h>
  +#endif
   
   /*
    * rsa sslc uses incomplete types for most structures
  @@ -121,7 +134,13 @@
   
   #define HAVE_SSL_X509V3_EXT_d2i
   
  -#else /* RSA sslc */
  +#else /* HAVE_SSLC */
  +
  +#include <sslc.h>
  +
  +#if SSLC_VERSION > 0x1FFF
  +#include <x509v3.h>
  +#endif
   
   /* sslc does not support this function, OpenSSL has since 9.5.1 */
   #define RAND_status() 1
  @@ -171,8 +190,6 @@
   #define modssl_set_verify(ssl, verify, cb) \
       SSL_set_verify(ssl, verify)
   
  -#define NO_SSL_X509V3_H
  -
   #endif
   
   /* BEGIN GENERATED SECTION */
  @@ -208,10 +225,6 @@
   #ifndef modssl_set_verify
   #define modssl_set_verify(ssl, verify, cb) \
       SSL_set_verify(ssl, verify, cb)
  -#endif
  -
  -#ifndef NO_SSL_X509V3_H
  -#define HAVE_SSL_X509V3_H
   #endif
   
   #endif /* SSL_TOOLKIT_COMPAT_H */
  
  
  

Mime
View raw message