From: hno <>
Date: Sun, 23 Oct 2005 21:50:01 +0000 (+0000)
Subject: Try to work around OpenSSL 0.9.8 change
X-Git-Tag: SQUID_3_0_PRE4~575
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e33d58cc913a2f21cf8ee9ca808807d55583446;p=thirdparty%2Fsquid.git

Try to work around OpenSSL 0.9.8 change
---

diff --git a/src/client_side.cc b/src/client_side.cc
index e0272a8999..a6d25b58dd 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.699 2005/10/23 11:55:36 hno Exp $
+ * $Id: client_side.cc,v 1.700 2005/10/23 15:50:01 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2951,7 +2951,12 @@ clientNegotiateSSL(int fd, void *data)
             /* Write out the SSL session details.. actually the call below, but
              * OpenSSL headers do strange typecasts confusing GCC.. */
             /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x0090708FL
+            PEM_ASN1_write((id2_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *)SSL_get_session(ssl), NULL,NULL,0,NULL,NULL);
+#else
+
             PEM_ASN1_write((int(*)())i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *)SSL_get_session(ssl), NULL,NULL,0,NULL,NULL);
+#endif
             /* Note: This does not automatically fflush the log file.. */
         }