From 84a2edcdf7cfb6d94572b3339d3924e0b91b3e7c Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Mon, 9 Jan 2012 21:35:11 +0100 Subject: Issue #13747: fix documentation error about the default SSL version. --- Doc/library/ssl.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index b38d066..cdd3db8 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -108,9 +108,8 @@ instead. The parameter ``ssl_version`` specifies which version of the SSL protocol to use. Typically, the server chooses a particular protocol version, and the client must adapt to the server's choice. Most of the versions are not - interoperable with the other versions. If not specified, for client-side - operation, the default SSL version is SSLv3; for server-side operation, - SSLv23. These version selections provide the most compatibility with other + interoperable with the other versions. If not specified, the default is + :data:`PROTOCOL_SSLv23`; it provides the most compatibility with other versions. Here's a table showing which versions in a client (down the side) can connect -- cgit v0.12 From ac8bfcacfc4276f017e123cde847935c21fd9743 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Mon, 9 Jan 2012 21:43:18 +0100 Subject: Issue #13747: fix SSL compatibility table. --- Doc/library/ssl.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index cdd3db8..0bd54c7 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -121,7 +121,7 @@ instead. *client* / **server** **SSLv2** **SSLv3** **SSLv23** **TLSv1** ------------------------ --------- --------- ---------- --------- *SSLv2* yes no yes no - *SSLv3* yes yes yes no + *SSLv3* no yes yes no *SSLv23* yes no yes no *TLSv1* no no yes yes ======================== ========= ========= ========== ========= -- cgit v0.12