From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 7 May 2011 05:45:36 +0000 (-0600)
Subject: Support OpenSSL 1.0.0 built without SSLv2
X-Git-Tag: SQUID_3_1_12_2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c3c693b1921e92509fc82e4a7e68f91c4225182;p=thirdparty%2Fsquid.git

Support OpenSSL 1.0.0 built without SSLv2
---

diff --git a/src/ssl_support.cc b/src/ssl_support.cc
index 974844bd70..546c4cbd54 100644
--- a/src/ssl_support.cc
+++ b/src/ssl_support.cc
@@ -681,8 +681,13 @@ sslCreateServerContext(const char *certfile, const char *keyfile, int version, c
     switch (version) {
 
     case 2:
+#ifndef OPENSSL_NO_SSL2
         debugs(83, 5, "Using SSLv2.");
         method = SSLv2_server_method();
+#else
+        debugs(83, 1, "SSLv2 is not available in this Proxy.");
+        return NULL;
+#endif
         break;
 
     case 3:
@@ -879,8 +884,13 @@ sslCreateClientContext(const char *certfile, const char *keyfile, int version, c
     switch (version) {
 
     case 2:
+#ifndef OPENSSL_NO_SSL2
         debugs(83, 5, "Using SSLv2.");
         method = SSLv2_client_method();
+#else
+        debugs(83, 1, "SSLv2 is not available in this Proxy.");
+        return NULL;
+#endif
         break;
 
     case 3: