[Python-checkins] bpo-31533: fix broken link to OpenSSL docs (GH-3674) (GH-3675)
Mariatta
webhook-mailer at python.org
Wed Sep 20 16:23:01 EDT 2017
https://github.com/python/cpython/commit/6b44ad1abdb9b3aaf27e2ba1fc4b69b9a0f50c25
commit: 6b44ad1abdb9b3aaf27e2ba1fc4b69b9a0f50c25
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-09-20T13:22:56-07:00
summary:
bpo-31533: fix broken link to OpenSSL docs (GH-3674) (GH-3675)
(cherry picked from commit 19e4d9346db7fb65845b98a9cb9caacaaac8a81a)
files:
M Doc/library/ssl.rst
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index d7e0467239b..495cd590f89 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -218,7 +218,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://www.openssl.org/docs/apps/ciphers.html#CIPHER-LIST-FORMAT>`_.
+ <https://wiki.openssl.org/index.php/Manual:Ciphers(1)#CIPHER_LIST_FORMAT>`_.
The parameter ``do_handshake_on_connect`` specifies whether to do the SSL
handshake automatically after doing a :meth:`socket.connect`, or whether the
@@ -1445,7 +1445,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://www.openssl.org/docs/apps/ciphers.html#CIPHER-LIST-FORMAT>`_.
+ <https://wiki.openssl.org/index.php/Manual:Ciphers(1)#CIPHER_LIST_FORMAT>`_.
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.
More information about the Python-checkins
mailing list