From: hno <>
Date: Sat, 8 Feb 2003 21:55:07 +0000 (+0000)
Subject: Bug #501: ssl_support.c build fails when using OpenSSL 0.9.7
X-Git-Tag: SQUID_3_0_PRE1~377
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=673cd7db579646e672d29a3937fa0aa1c0061427;p=thirdparty%2Fsquid.git

Bug #501: ssl_support.c build fails when using OpenSSL 0.9.7
---

diff --git a/src/ssl_support.cc b/src/ssl_support.cc
index 8395a8a727..4bf2594a01 100644
--- a/src/ssl_support.cc
+++ b/src/ssl_support.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl_support.cc,v 1.10 2003/01/23 00:37:25 robertc Exp $
+ * $Id: ssl_support.cc,v 1.11 2003/02/08 14:55:07 hno Exp $
  *
  * AUTHOR: Benno Rice
  * DEBUG: section 83    SSL accelerator support
@@ -125,69 +125,116 @@ static struct ssl_option {
     long value;
 } ssl_options[] = {
 
+#ifdef SSL_OP_MICROSOFT_SESS_ID_BUG
     {
 	"MICROSOFT_SESS_ID_BUG", SSL_OP_MICROSOFT_SESS_ID_BUG
     },
+#endif
+#ifdef SSL_OP_NETSCAPE_CHALLENGE_BUG
     {
 	"NETSCAPE_CHALLENGE_BUG", SSL_OP_NETSCAPE_CHALLENGE_BUG
     },
+#endif
+#ifdef SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
     {
 	"NETSCAPE_REUSE_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
     },
+#endif
+#ifdef SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG
     {
 	"SSLREF2_REUSE_CERT_TYPE_BUG", SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG
     },
+#endif
+#ifdef SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER
     {
 	"MICROSOFT_BIG_SSLV3_BUFFER", SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER
     },
+#endif
+#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING
     {
 	"MSIE_SSLV2_RSA_PADDING", SSL_OP_MSIE_SSLV2_RSA_PADDING
     },
+#endif
+#ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG
     {
 	"SSLEAY_080_CLIENT_DH_BUG", SSL_OP_SSLEAY_080_CLIENT_DH_BUG
     },
+#endif
+#ifdef SSL_OP_TLS_D5_BUG
     {
 	"TLS_D5_BUG", SSL_OP_TLS_D5_BUG
     },
+#endif
+#ifdef SSL_OP_TLS_BLOCK_PADDING_BUG
     {
 	"TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG
     },
+#endif
+#ifdef SSL_OP_TLS_ROLLBACK_BUG
     {
 	"TLS_ROLLBACK_BUG", SSL_OP_TLS_ROLLBACK_BUG
     },
+#endif
+#ifdef SSL_OP_ALL
+    {
+	"ALL", SSL_OP_ALL
+    },
+#endif
+#ifdef SSL_OP_SINGLE_DH_USE
     {
 	"SINGLE_DH_USE", SSL_OP_SINGLE_DH_USE
     },
+#endif
+#ifdef SSL_OP_EPHEMERAL_RSA
     {
 	"EPHEMERAL_RSA", SSL_OP_EPHEMERAL_RSA
     },
+#endif
+#ifdef SSL_OP_PKCS1_CHECK_1
     {
 	"PKCS1_CHECK_1", SSL_OP_PKCS1_CHECK_1
     },
+#endif
+#ifdef SSL_OP_PKCS1_CHECK_2
     {
 	"PKCS1_CHECK_2", SSL_OP_PKCS1_CHECK_2
     },
+#endif
+#ifdef SSL_OP_NETSCAPE_CA_DN_BUG
     {
 	"NETSCAPE_CA_DN_BUG", SSL_OP_NETSCAPE_CA_DN_BUG
     },
+#endif
+#ifdef SSL_OP_NON_EXPORT_FIRST
     {
 	"NON_EXPORT_FIRST", SSL_OP_NON_EXPORT_FIRST
     },
+#endif
+#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
     {
-	"NETSCAPE_DEMO_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
+	"CIPHER_SERVER_PREFERENCE", SSL_OP_CIPHER_SERVER_PREFERENCE
     },
+#endif
+#ifdef SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
     {
-	"ALL", SSL_OP_ALL
+	"NETSCAPE_DEMO_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG
     },
+#endif
+#ifdef SSL_OP_NO_SSLv2
     {
 	"NO_SSLv2", SSL_OP_NO_SSLv2
     },
+#endif
+#ifdef SSL_OP_NO_SSLv3
     {
 	"NO_SSLv3", SSL_OP_NO_SSLv3
     },
+#endif
+#ifdef SSL_OP_NO_TLSv1
     {
 	"NO_TLSv1", SSL_OP_NO_TLSv1
     },
+#endif
     {
 	"", 0
     },