diff options
| author | Christian Heimes <christian@python.org> | 2017-08-15 08:33:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-15 08:33:43 (GMT) |
| commit | 7b40cb7293cb14e5c7c8ed123efaf9acb33edae2 (patch) | |
| tree | 6cd0b399316af58fac738d8c0b153bd311b4050a | |
| parent | 2f8964634918bdf09107c49a2d5ca62460091e54 (diff) | |
| download | cpython-7b40cb7293cb14e5c7c8ed123efaf9acb33edae2.zip cpython-7b40cb7293cb14e5c7c8ed123efaf9acb33edae2.tar.gz cpython-7b40cb7293cb14e5c7c8ed123efaf9acb33edae2.tar.bz2 | |
bpo-30714: ALPN changes for OpenSSL 1.1.0f (#2305)
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>
| -rw-r--r-- | Doc/library/ssl.rst | 5 | ||||
| -rw-r--r-- | Lib/test/test_ssl.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 729a239..0a09e7e 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -1447,8 +1447,9 @@ to speed up repeated connections from the same clients. 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:: 3.5 diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index d960d82..104b7f3 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -3268,8 +3268,9 @@ if _have_threads: 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" \ diff --git a/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst new file mode 100644 index 0000000..88394e5 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst @@ -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. |