summaryrefslogtreecommitdiffstats
path: root/Doc/library/ssl.rst
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-01-09 20:46:11 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-01-09 20:46:11 (GMT)
commit8a9b9c7d165c55ef368a5d0be539e17ad3f201d4 (patch)
tree056713fe17045ef37ce81047bde0933c4fe24580 /Doc/library/ssl.rst
parent7b7caa8ec6ba82d113121cda69583272fcde86d5 (diff)
parentac8bfcacfc4276f017e123cde847935c21fd9743 (diff)
downloadcpython-8a9b9c7d165c55ef368a5d0be539e17ad3f201d4.zip
cpython-8a9b9c7d165c55ef368a5d0be539e17ad3f201d4.tar.gz
cpython-8a9b9c7d165c55ef368a5d0be539e17ad3f201d4.tar.bz2
Merge SSL doc fixes (issue #13747).
Diffstat (limited to 'Doc/library/ssl.rst')
-rw-r--r--Doc/library/ssl.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 6ffdc76..750fbb7 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -152,9 +152,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
@@ -166,7 +165,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
======================== ========= ========= ========== =========