From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 25 Apr 2009 02:12:22 +0000 (+1200)
Subject: Author: Hasso Tepper <hasso@estpak.ee>
X-Git-Tag: SQUID_3_0_STABLE15~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a9f5b5bf92b4e9576914e3791f27c6d4594a9b3;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 462f04e4bd..45586d84d1 100644
--- a/src/ssl_support.cc
+++ b/src/ssl_support.cc
@@ -535,7 +535,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);
 
@@ -732,7 +736,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);