summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2017-08-15 08:33:43 (GMT)
committerGitHub <noreply@github.com>2017-08-15 08:33:43 (GMT)
commit7b40cb7293cb14e5c7c8ed123efaf9acb33edae2 (patch)
tree6cd0b399316af58fac738d8c0b153bd311b4050a /Doc
parent2f8964634918bdf09107c49a2d5ca62460091e54 (diff)
downloadcpython-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>
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ssl.rst5
1 files changed, 3 insertions, 2 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