From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 23 Apr 2009 08:15:53 +0000 (+1200)
Subject: Author: Hasso Tepper <hasso@estpak.ee>
X-Git-Tag: SQUID_3_2_0_1~1052
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1c9c8502d9560283b6a75d20e2a35a2c2fa4486;p=thirdparty%2Fsquid.git

Author: Hasso Tepper <hasso@estpak.ee>
Fix OpenSSL portability problem

Received via NetBSD project.

Their CVS log attributes says, the fix is from hasso@estpak.ee:

| Fix two problems reported by Hasso Tepper via PR pkg/39554.
|
| * OpenSSL portability problem.

(other not relevant to this patch)
---

diff --git a/src/ssl_support.cc b/src/ssl_support.cc
index 1563ee176c..fa76d97e7f 100644
--- a/src/ssl_support.cc
+++ b/src/ssl_support.cc
@@ -638,7 +638,11 @@ SSL_CTX *
 sslCreateServerContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *clientCA, const char *CAfile, const char *CApath, const char *CRLfile, const char *dhfile, const char *context)
 {
     int ssl_error;
+#if OPENSSL_VERSION_NUMBER < 0x00909000L
     SSL_METHOD *method;
+#else
+    const SSL_METHOD *method;
+#endif
     SSL_CTX *sslContext;
     long fl = ssl_parse_flags(flags);
 
@@ -835,7 +839,11 @@ SSL_CTX *
 sslCreateClientContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *CAfile, const char *CApath, const char *CRLfile)
 {
     int ssl_error;
+#if OPENSSL_VERSION_NUMBER < 0x00909000L
     SSL_METHOD *method;
+#else
+    const SSL_METHOD *method;
+#endif
     SSL_CTX *sslContext;
     long fl = ssl_parse_flags(flags);