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 mod_ssl.c mod_ssl.h ssl_engine_config.c ssl_engine_init.c ssl_toolkit_compat.h
Date Mon, 19 May 2003 14:48:47 GMT
wrowe       2003/05/19 07:48:47

  Modified:    modules/ssl config.m4 mod_ssl.c mod_ssl.h
                        ssl_engine_config.c ssl_engine_init.c
                        ssl_toolkit_compat.h
  Log:
    Roll away the SSL_EXPERIMENTAL_ENGINE test in favor of testing for the
    ENGINE_init() function in config.m4, and rely on HAVE_ENGINE_INIT instead.
  
  Reviewed by: Ben Laurie (concept)
  
  Revision  Changes    Path
  1.14      +1 -0      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- config.m4	19 May 2003 14:43:20 -0000	1.13
  +++ config.m4	19 May 2003 14:48:47 -0000	1.14
  @@ -79,6 +79,7 @@
       APACHE_CHECK_SSL_TOOLKIT
       AC_CHECK_FUNCS(SSL_set_state)
       AC_CHECK_FUNCS(SSL_set_cert_store)
  +    AC_CHECK_FUNCS(ENGINE_init)
   ])
   
   dnl #  end of module specific part
  
  
  
  1.79      +1 -1      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.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- mod_ssl.c	23 Feb 2003 17:12:43 -0000	1.78
  +++ mod_ssl.c	19 May 2003 14:48:47 -0000	1.79
  @@ -116,7 +116,7 @@
       SSL_CMD_SRV(SessionCache, TAKE1,
                   "SSL Session Cache storage "
                   "(`none', `dbm:/path/to/file')")
  -#ifdef SSL_EXPERIMENTAL_ENGINE
  +#ifdef HAVE_ENGINE_INIT
       SSL_CMD_SRV(CryptoDevice, TAKE1,
                   "SSL external Crypto Device usage "
                   "(`builtin', `...')")
  
  
  
  1.135     +1 -14     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.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- mod_ssl.h	16 May 2003 18:22:44 -0000	1.134
  +++ mod_ssl.h	19 May 2003 14:48:47 -0000	1.135
  @@ -64,19 +64,6 @@
   #ifndef __MOD_SSL_H__
   #define __MOD_SSL_H__
   
  -/* 
  - * Optionally enable the experimental stuff, but allow the user to
  - * override the decision which experimental parts are included by using
  - * CFLAGS="-DSSL_EXPERIMENTAL_xxxx_IGNORE".
  - */
  -#ifdef SSL_EXPERIMENTAL
  -#ifdef SSL_ENGINE
  -#ifndef SSL_EXPERIMENTAL_ENGINE_IGNORE
  -#define SSL_EXPERIMENTAL_ENGINE
  -#endif
  -#endif
  -#endif /* SSL_EXPERIMENTAL */
  -
   /*
    * Power up our brain...
    */
  @@ -414,7 +401,7 @@
       void           *pTmpKeys[SSL_TMP_KEY_MAX];
       apr_hash_t     *tPublicCert;
       apr_hash_t     *tPrivateKey;
  -#ifdef SSL_EXPERIMENTAL_ENGINE
  +#ifdef HAVE_ENGINE_INIT
       char           *szCryptoDevice;
   #endif
       struct {
  
  
  
  1.78      +2 -2      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.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- ssl_engine_config.c	29 Mar 2003 02:18:43 -0000	1.77
  +++ ssl_engine_config.c	19 May 2003 14:48:47 -0000	1.78
  @@ -108,7 +108,7 @@
       mc->tVHostKeys             = apr_hash_make(pool);
       mc->tPrivateKey            = apr_hash_make(pool);
       mc->tPublicCert            = apr_hash_make(pool);
  -#ifdef SSL_EXPERIMENTAL_ENGINE
  +#ifdef HAVE_ENGINE_INIT
       mc->szCryptoDevice         = NULL;
   #endif
   
  @@ -510,7 +510,7 @@
       return NULL;
   }
   
  -#ifdef SSL_EXPERIMENTAL_ENGINE
  +#ifdef HAVE_ENGINE_INIT
   const char *ssl_cmd_SSLCryptoDevice(cmd_parms *cmd,
                                       void *dcfg,
                                       const char *arg)
  
  
  
  1.113     +2 -2      httpd-2.0/modules/ssl/ssl_engine_init.c
  
  Index: ssl_engine_init.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- ssl_engine_init.c	3 Apr 2003 04:54:20 -0000	1.112
  +++ ssl_engine_init.c	19 May 2003 14:48:47 -0000	1.113
  @@ -270,7 +270,7 @@
       /*
        * SSL external crypto device ("engine") support
        */
  -#ifdef SSL_EXPERIMENTAL_ENGINE
  +#ifdef HAVE_ENGINE_INIT
       ssl_init_Engine(base_server, p);
   #endif
   
  @@ -351,7 +351,7 @@
    * Support for external a Crypto Device ("engine"), usually
    * a hardware accellerator card for crypto operations.
    */
  -#ifdef SSL_EXPERIMENTAL_ENGINE
  +#ifdef HAVE_ENGINE_INIT
   void ssl_init_Engine(server_rec *s, apr_pool_t *p)
   {
       SSLModConfigRec *mc = myModConfig(s);
  
  
  
  1.33      +1 -1      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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ssl_toolkit_compat.h	1 May 2003 13:10:36 -0000	1.32
  +++ ssl_toolkit_compat.h	19 May 2003 14:48:47 -0000	1.33
  @@ -66,7 +66,7 @@
   #include <openssl/evp.h>
   #include <openssl/rand.h>
   #include <openssl/x509v3.h>
  -#ifdef SSL_EXPERIMENTAL_ENGINE
  +#ifdef HAVE_ENGINE_INIT
   #include <openssl/engine.h>
   #endif
   
  
  
  

Mime
View raw message