Skip to content

Commit dfb735a

Browse files
Marcin Niemirabenjaminp
authored andcommitted
[3.6] closes bpo-34050: Fix link in SSL docs (GH-8173)
(cherry picked from commit 9c5ba09) Co-authored-by: Marcin Niemira <marcin@niemira.net>
1 parent 445f9ed commit dfb735a

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
@@ -221,7 +221,7 @@ instead.
221221

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

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

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

Misc/ACKS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,6 +1727,7 @@ Gordon Worley
17271727
Darren Worrall
17281728
Thomas Wouters
17291729
Daniel Wozniak
1730+
Marcin Niemira
17301731
Wei Wu
17311732
Heiko Wundram
17321733
Doug Wyatt

0 commit comments

Comments
 (0)