Skip to content

Commit 3707dfa

Browse files
benjaminpMarcin Niemira
andauthored
[2.7] closes bpo-34050: Fix link in SSL docs (GH-8173). (GH-8179)
(cherry picked from commit 9c5ba09) Co-authored-by: Marcin Niemira <[email protected]>
1 parent ad0fc8d commit 3707dfa

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Doc/library/ssl.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ instead.
214214

215215
The *ciphers* parameter sets the available ciphers for this SSL object.
216216
It should be a string in the `OpenSSL cipher list format
217-
<https://wiki.openssl.org/index.php/Manual:Ciphers(1)#CIPHER_LIST_FORMAT>`_.
217+
<https://www.openssl.org/docs/manmaster/man1/ciphers.html>`_.
218218

219219
The parameter ``do_handshake_on_connect`` specifies whether to do the SSL
220220
handshake automatically after doing a :meth:`socket.connect`, or whether the
@@ -1170,7 +1170,7 @@ to speed up repeated connections from the same clients.
11701170

11711171
Set the available ciphers for sockets created with this context.
11721172
It should be a string in the `OpenSSL cipher list format
1173-
<https://wiki.openssl.org/index.php/Manual:Ciphers(1)#CIPHER_LIST_FORMAT>`_.
1173+
<https://www.openssl.org/docs/manmaster/man1/ciphers.html>`_.
11741174
If no cipher can be selected (because compile-time options or other
11751175
configuration forbids use of all the specified ciphers), an
11761176
:class:`SSLError` will be raised.

Misc/ACKS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,6 +1565,7 @@ Gordon Worley
15651565
Darren Worrall
15661566
Thomas Wouters
15671567
Daniel Wozniak
1568+
Marcin Niemira
15681569
Heiko Wundram
15691570
Doug Wyatt
15701571
Xiang Zhang

0 commit comments

Comments
 (0)