diff options
author | Benjamin Peterson <benjamin@python.org> | 2018-07-07 15:48:07 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-07 15:48:07 -0700 |
commit | 3707dfaf45baf867f17bbbc78ccf2f0d13711dbd (patch) | |
tree | 3e0594d99527cd519a2b6fb756171c676f648758 /Doc | |
parent | ad0fc8ddba0e2f6715dc14c74cb4dbd437b3777d (diff) | |
download | cpython-git-3707dfaf45baf867f17bbbc78ccf2f0d13711dbd.tar.gz |
[2.7] closes bpo-34050: Fix link in SSL docs (GH-8173). (GH-8179)
(cherry picked from commit 9c5ba097485c8c643b670acd4026f4382bc92f4b)
Co-authored-by: Marcin Niemira <marcin@niemira.net>
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/ssl.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 2a5b8f6620..0421031772 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -214,7 +214,7 @@ instead. The *ciphers* parameter sets the available ciphers for this SSL object. 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 handshake automatically after doing a :meth:`socket.connect`, or whether the @@ -1170,7 +1170,7 @@ to speed up repeated connections from the same clients. Set the available ciphers for sockets created with this context. 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 configuration forbids use of all the specified ciphers), an :class:`SSLError` will be raised. |