Commit 3707dfaf authored by Benjamin Peterson's avatar Benjamin Peterson Committed by GitHub

[2.7] closes bpo-34050: Fix link in SSL docs (GH-8173). (GH-8179)

(cherry picked from commit 9c5ba097)
Co-authored-by: default avatarMarcin Niemira <marcin@niemira.net>
parent ad0fc8dd
...@@ -214,7 +214,7 @@ instead. ...@@ -214,7 +214,7 @@ instead.
The *ciphers* parameter sets the available ciphers for this SSL object. The *ciphers* parameter sets the available ciphers for this SSL object.
It should be a string in the `OpenSSL cipher list format It should be a string in the `OpenSSL cipher list format
<https://wiki.openssl.org/index.php/Manual:Ciphers(1)#CIPHER_LIST_FORMAT>`_. <https://www.openssl.org/docs/manmaster/man1/ciphers.html>`_.
The parameter ``do_handshake_on_connect`` specifies whether to do the SSL The parameter ``do_handshake_on_connect`` specifies whether to do the SSL
handshake automatically after doing a :meth:`socket.connect`, or whether the handshake automatically after doing a :meth:`socket.connect`, or whether the
...@@ -1170,7 +1170,7 @@ to speed up repeated connections from the same clients. ...@@ -1170,7 +1170,7 @@ to speed up repeated connections from the same clients.
Set the available ciphers for sockets created with this context. Set the available ciphers for sockets created with this context.
It should be a string in the `OpenSSL cipher list format It should be a string in the `OpenSSL cipher list format
<https://wiki.openssl.org/index.php/Manual:Ciphers(1)#CIPHER_LIST_FORMAT>`_. <https://www.openssl.org/docs/manmaster/man1/ciphers.html>`_.
If no cipher can be selected (because compile-time options or other If no cipher can be selected (because compile-time options or other
configuration forbids use of all the specified ciphers), an configuration forbids use of all the specified ciphers), an
:class:`SSLError` will be raised. :class:`SSLError` will be raised.
......
...@@ -1565,6 +1565,7 @@ Gordon Worley ...@@ -1565,6 +1565,7 @@ Gordon Worley
Darren Worrall Darren Worrall
Thomas Wouters Thomas Wouters
Daniel Wozniak Daniel Wozniak
Marcin Niemira
Heiko Wundram Heiko Wundram
Doug Wyatt Doug Wyatt
Xiang Zhang Xiang Zhang
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment