diff options
| author | Christian Heimes <christian@python.org> | 2018-03-24 14:41:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-24 14:41:37 (GMT) |
| commit | 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1 (patch) | |
| tree | b84760e0dd0aeb8fd100f31823c283e3d3785296 /Modules/_ssl.c | |
| parent | e42ae915095ebca789cc36f3a336a3331fe35945 (diff) | |
| download | cpython-4ca0739c9d97ac7cd45499e0d31be68dc659d0e1.zip cpython-4ca0739c9d97ac7cd45499e0d31be68dc659d0e1.tar.gz cpython-4ca0739c9d97ac7cd45499e0d31be68dc659d0e1.tar.bz2 | |
bpo-33127: Compatibility patch for LibreSSL 2.7.0 (GH-6210)
LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
LibreSSL < 2.7.
Documentation updates and fixes for failing tests will be provided in
another patch set.
Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index f9e061d..30c3403 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -136,6 +136,12 @@ static void _PySSLFixErrno(void) { #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) # define OPENSSL_VERSION_1_1 1 +# define PY_OPENSSL_1_1_API 1 +#endif + +/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ +#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL +# define PY_OPENSSL_1_1_API 1 #endif /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 @@ -182,13 +188,17 @@ static void _PySSLFixErrno(void) { #define INVALID_SOCKET (-1) #endif -#ifdef OPENSSL_VERSION_1_1 -/* OpenSSL 1.1.0+ */ -#ifndef OPENSSL_NO_SSL2 +/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ +#ifndef OPENSSL_VERSION_1_1 +#define HAVE_OPENSSL_CRYPTO_LOCK +#endif + +#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) #define OPENSSL_NO_SSL2 #endif -#else /* OpenSSL < 1.1.0 */ -#define HAVE_OPENSSL_CRYPTO_LOCK + +#ifndef PY_OPENSSL_1_1_API +/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ #define TLS_method SSLv23_method #define TLS_client_method SSLv23_client_method @@ -250,7 +260,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) return s->tlsext_tick_lifetime_hint; } -#endif /* OpenSSL < 1.1.0 or LibreSSL */ +#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ /* Default cipher suites */ #ifndef PY_SSL_DEFAULT_CIPHERS |