From: serassio <>
Date: Wed, 30 Nov 2005 03:18:20 +0000 (+0000)
Subject: Bug #1409: OpenBSD and NetBSD error on make with SSL include
X-Git-Tag: SQUID_3_0_PRE4~480
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2930f30379fb32fa8a14de59f0d3726a7c9506dd;p=thirdparty%2Fsquid.git

Bug #1409: OpenBSD and NetBSD error on make with SSL include

Workaround for OpenSSL 0.9.7d.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index fa3e602f6e..c10cf436e5 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.703 2005/11/21 23:26:45 wessels Exp $
+ * $Id: client_side.cc,v 1.704 2005/11/29 20:18:20 serassio Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2955,6 +2955,11 @@ clientNegotiateSSL(int fd, void *data)
             /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */
 #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x0090708FL
             PEM_ASN1_write((i2d_of_void *)i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *)SSL_get_session(ssl), NULL,NULL,0,NULL,NULL);
+
+#elif defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER == 0x0090704fL
+
+            PEM_ASN1_write((int(*)(...))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);