Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 12 Aug 2003 20:58:53 -0000
Message-ID: <20030812205853.64981.qmail@minotaur.apache.org>
From: jwoolley@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/ssl mod_ssl.c mod_ssl.h
 ssl_engine_config.c

jwoolley    2003/08/12 13:58:53

  Modified:    modules/ssl mod_ssl.c mod_ssl.h ssl_engine_config.c
  Log:
  Make mod_ssl consistent with itself when you have a halfass install of
  openssl-engine (ie, you're missing the headers).  ssl_cmd_SSLCryptoDevice()
  is thrown away by the preprocessor if you're missing the header, so the
  call to it should have the same condition applied.  otherwise, mod_ssl
  will fail to link.
  
  Revision  Changes    Path
  1.87      +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.86
  retrieving revision 1.87
  diff -u -d -u -r1.86 -r1.87
  --- mod_ssl.c	24 Jun 2003 21:40:32 -0000	1.86
  +++ mod_ssl.c	12 Aug 2003 20:58:53 -0000	1.87
  @@ -116,7 +116,7 @@
       SSL_CMD_SRV(SessionCache, TAKE1,
                   "SSL Session Cache storage "
                   "(`none', `dbm:/path/to/file')")
  -#ifdef HAVE_ENGINE_INIT
  +#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
       SSL_CMD_SRV(CryptoDevice, TAKE1,
                   "SSL external Crypto Device usage "
                   "(`builtin', `...')")
  
  
  
  1.139     +1 -1      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.138
  retrieving revision 1.139
  diff -u -d -u -r1.138 -r1.139
  --- mod_ssl.h	14 Jul 2003 17:16:47 -0000	1.138
  +++ mod_ssl.h	12 Aug 2003 20:58:53 -0000	1.139
  @@ -401,7 +401,7 @@
       void           *pTmpKeys[SSL_TMP_KEY_MAX];
       apr_hash_t     *tPublicCert;
       apr_hash_t     *tPrivateKey;
  -#ifdef HAVE_ENGINE_INIT
  +#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
       const char     *szCryptoDevice;
   #endif
       struct {
  
  
  
  1.82      +1 -1      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.81
  retrieving revision 1.82
  diff -u -d -u -r1.81 -r1.82
  --- ssl_engine_config.c	7 Jun 2003 19:50:01 -0000	1.81
  +++ ssl_engine_config.c	12 Aug 2003 20:58:53 -0000	1.82
  @@ -107,7 +107,7 @@
       mc->tVHostKeys             = apr_hash_make(pool);
       mc->tPrivateKey            = apr_hash_make(pool);
       mc->tPublicCert            = apr_hash_make(pool);
  -#ifdef HAVE_ENGINE_INIT
  +#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
       mc->szCryptoDevice         = NULL;
   #endif