61 lines
3.1 KiB
Diff
61 lines
3.1 KiB
Diff
|
From 05b7d9c6675b71d17f5fcf379b3888fba431f14e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Christian Heimes <christian@python.org>
|
||
|
|
Date: Tue, 15 Aug 2017 10:55:03 +0200
|
||
|
|
Subject: [PATCH] [2.7] bpo-30714: ALPN changes for OpenSSL 1.1.0f (#3094)
|
||
|
|
|
||
|
|
OpenSSL 1.1.0 to 1.1.0e aborted the handshake when server and client
|
||
|
|
could not agree on a protocol using ALPN. OpenSSL 1.1.0f changed that.
|
||
|
|
The most recent version now behaves like OpenSSL 1.0.2 again. The ALPN
|
||
|
|
callback can pretend to not been set.
|
||
|
|
|
||
|
|
See https://github.com/openssl/openssl/pull/3158 for more details
|
||
|
|
|
||
|
|
Signed-off-by: Christian Heimes <christian@python.org>
|
||
|
|
(cherry picked from commit a5c1bab352671e043645163ca50c5211aa657acd)
|
||
|
|
---
|
||
|
|
Doc/library/ssl.rst | 5 +++--
|
||
|
|
Lib/test/test_ssl.py | 5 +++--
|
||
|
|
Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst | 2 ++
|
||
|
|
3 files changed, 8 insertions(+), 4 deletions(-)
|
||
|
|
create mode 100644 Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
|
||
|
|
|
||
|
|
Index: Python-2.7.13/Doc/library/ssl.rst
|
||
|
|
===================================================================
|
||
|
|
--- Python-2.7.13.orig/Doc/library/ssl.rst 2016-12-17 21:05:05.000000000 +0100
|
||
|
|
+++ Python-2.7.13/Doc/library/ssl.rst 2017-09-14 16:14:26.733996348 +0200
|
||
|
|
@@ -1158,8 +1158,9 @@ to speed up repeated connections from th
|
||
|
|
This method will raise :exc:`NotImplementedError` if :data:`HAS_ALPN` is
|
||
|
|
False.
|
||
|
|
|
||
|
|
- OpenSSL 1.1.0+ will abort the handshake and raise :exc:`SSLError` when
|
||
|
|
- both sides support ALPN but cannot agree on a protocol.
|
||
|
|
+ OpenSSL 1.1.0 to 1.1.0e will abort the handshake and raise :exc:`SSLError`
|
||
|
|
+ when both sides support ALPN but cannot agree on a protocol. 1.1.0f+
|
||
|
|
+ behaves like 1.0.2, :meth:`SSLSocket.selected_alpn_protocol` returns None.
|
||
|
|
|
||
|
|
.. versionadded:: 2.7.10
|
||
|
|
|
||
|
|
Index: Python-2.7.13/Lib/test/test_ssl.py
|
||
|
|
===================================================================
|
||
|
|
--- Python-2.7.13.orig/Lib/test/test_ssl.py 2016-12-17 21:05:06.000000000 +0100
|
||
|
|
+++ Python-2.7.13/Lib/test/test_ssl.py 2017-09-14 16:14:26.733996348 +0200
|
||
|
|
@@ -2963,8 +2963,9 @@ else:
|
||
|
|
except ssl.SSLError as e:
|
||
|
|
stats = e
|
||
|
|
|
||
|
|
- if expected is None and IS_OPENSSL_1_1:
|
||
|
|
- # OpenSSL 1.1.0 raises handshake error
|
||
|
|
+ if (expected is None and IS_OPENSSL_1_1
|
||
|
|
+ and ssl.OPENSSL_VERSION_INFO < (1, 1, 0, 6)):
|
||
|
|
+ # OpenSSL 1.1.0 to 1.1.0e raises handshake error
|
||
|
|
self.assertIsInstance(stats, ssl.SSLError)
|
||
|
|
else:
|
||
|
|
msg = "failed trying %s (s) and %s (c).\n" \
|
||
|
|
Index: Python-2.7.13/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst
|
||
|
|
===================================================================
|
||
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||
|
|
+++ Python-2.7.13/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst 2017-09-14 16:14:26.733996348 +0200
|
||
|
|
@@ -0,0 +1,2 @@
|
||
|
|
+Address ALPN callback changes for OpenSSL 1.1.0f. The latest version behaves
|
||
|
|
+like OpenSSL 1.0.2 and no longer aborts handshake.
|