From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 19 Feb 2012 20:22:39 +0000 (+0100)
Subject: Fix last remaining build issues of _ssl under old OpenSSLs. Patch by Vinay.
X-Git-Tag: v3.3.0a1~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c135fa424e768b78fae6ca997d8fe77a0d42447e;p=thirdparty%2FPython%2Fcpython.git

Fix last remaining build issues of _ssl under old OpenSSLs. Patch by Vinay.
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 33f06d6cab89..c6ce07545cd5 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -102,7 +102,8 @@ class BasicSocketTests(unittest.TestCase):
         ssl.CERT_REQUIRED
         ssl.OP_CIPHER_SERVER_PREFERENCE
         ssl.OP_SINGLE_DH_USE
-        ssl.OP_SINGLE_ECDH_USE
+        if ssl.HAS_ECDH:
+            ssl.OP_SINGLE_ECDH_USE
         if ssl.OPENSSL_VERSION_INFO >= (1, 0):
             ssl.OP_NO_COMPRESSION
         self.assertIn(ssl.HAS_SNI, {True, False})
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 8225e68f1d4e..690d0be647cc 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -150,6 +150,11 @@ static unsigned int _ssl_locks_count = 0;
 # define OPENSSL_NO_ECDH
 #endif
 
+/* compression support got added to OpenSSL in 0.9.8 */
+#if OPENSSL_VERSION_NUMBER < 0x0090800fL && !defined(OPENSSL_NO_COMP)
+# define OPENSSL_NO_COMP
+#endif
+
 
 typedef struct {
     PyObject_HEAD