mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source
This commit is contained in:
Antoine Pitrou 2012-02-19 21:22:39 +01:00
parent 7b77188e89
commit c135fa424e
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_ssl.py
View file

@ -102,7 +102,8 @@ class BasicSocketTests(unittest.TestCase):
ssl.CERT_REQUIRED ssl.CERT_REQUIRED
ssl.OP_CIPHER_SERVER_PREFERENCE ssl.OP_CIPHER_SERVER_PREFERENCE
ssl.OP_SINGLE_DH_USE 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): if ssl.OPENSSL_VERSION_INFO >= (1, 0):
ssl.OP_NO_COMPRESSION ssl.OP_NO_COMPRESSION
self.assertIn(ssl.HAS_SNI, {True, False}) self.assertIn(ssl.HAS_SNI, {True, False})

5
Modules/_ssl.c
View file

@ -150,6 +150,11 @@ static unsigned int _ssl_locks_count = 0;
# define OPENSSL_NO_ECDH # define OPENSSL_NO_ECDH
#endif #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 { typedef struct {
PyObject_HEAD PyObject_HEAD