diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-02-19 20:22:39 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-02-19 20:22:39 (GMT) |
| commit | c135fa424e768b78fae6ca997d8fe77a0d42447e (patch) | |
| tree | b966efbdcbf4cdde4669868cf32d20dc3c4a6215 | |
| parent | 7b77188e89182e0cf00d42f5556f972a739d6beb (diff) | |
| download | cpython-c135fa424e768b78fae6ca997d8fe77a0d42447e.zip cpython-c135fa424e768b78fae6ca997d8fe77a0d42447e.tar.gz cpython-c135fa424e768b78fae6ca997d8fe77a0d42447e.tar.bz2 | |
Fix last remaining build issues of _ssl under old OpenSSLs. Patch by Vinay.
| -rw-r--r-- | Lib/test/test_ssl.py | 3 | ||||
| -rw-r--r-- | Modules/_ssl.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 33f06d6..c6ce075 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 8225e68..690d0be 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 |