[Python-checkins] bpo-31533: fix broken link to OpenSSL docs (GH-3674) (GH-3676)

Mariatta webhook-mailer at python.org
Wed Sep 20 16:23:12 EDT 2017


https://github.com/python/cpython/commit/5b6452d412b5be45f265093e75563fcf6d05dc3e
commit: 5b6452d412b5be45f265093e75563fcf6d05dc3e
branch: 2.7
author: Christian Heimes <christian at python.org>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2017-09-20T13:23:09-07:00
summary:

bpo-31533: fix broken link to OpenSSL docs (GH-3674) (GH-3676)

(cherry picked from commit 19e4d93)

files:
M Doc/library/ssl.rst

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 288b2914a25..93df8d70559 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -211,7 +211,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
@@ -1167,7 +1167,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