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

pitrou · pitrou · commit c135fa424e76 · 2012-02-19T21:22:39.000+01:00
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -102,7 +102,8 @@ def test_constants(self):
         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
@@ -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
