Fix a compile failure with recent OpenSSL and picky compilers

(e.g., OpenSSL 0.9.7a and xlc_r on AIX).

The OpenSSL info callback field changed recently from a generic
function pointer to a specific one, and ssl_callback_LogTracingState
wasn't quite right.

old:
ssl.h:        void (*info_callback)();

new:
ssl.h:        void (*info_callback)(const SSL *ssl,int type,int val);

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99201 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index b2f2fe81d44fb890293b2f515f4323a67af934ce..67921e4d85cc1d0739dbfc8ae72b91ca919c287a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fix a compile failure with recent OpenSSL and picky compilers
+     (e.g., OpenSSL 0.9.7a and xlc_r on AIX).  [Jeff Trawick]
+
   *) Fix a build problem with passing unsupported --enable-layout
      args to apr and apr-util.  This broke binbuild.sh as well as
      user-specified layout parameters.  PR 18649 [Justin Erenkrantz,

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index c913203326945c25e96f2a0168db47deb2989a69..00075d906f7e49260bff62f5a547b65044d27044 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -588,7 +588,7 @@ int          ssl_callback_proxy_cert(SSL *ssl, MODSSL_CLIENT_CERT_CB_ARG_TYPE **
 int          ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);
 SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);
 void         ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);
-void         ssl_callback_LogTracingState(SSL *, int, int);
+void         ssl_callback_LogTracingState(const SSL *, int, int);
 
 /*  Session Cache Support  */
 void         ssl_scache_init(server_rec *, apr_pool_t *);

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index c4cb37880e5225c2cd4dca63cab23c86648b8c0b..429ed18841e7b3f915c0b20027db1255e65d5108 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -1745,7 +1745,7 @@ void ssl_callback_DelSessionCacheEntry(SSL_CTX *ctx,
  * SSL handshake and does SSL record layer stuff. We use it to
  * trace OpenSSL's processing in out SSL logfile.
  */
-void ssl_callback_LogTracingState(SSL *ssl, int where, int rc)
+void ssl_callback_LogTracingState(const SSL *ssl, int where, int rc)
 {
     conn_rec *c;
     server_rec *s;