mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-17 17:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge SSL doc fixes (issue #13747).

Browse source
This commit is contained in:
Antoine Pitrou 2012-01-09 21:46:11 +01:00
commit 8a9b9c7d16
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Doc/library/ssl.rst
View file

@ -152,9 +152,8 @@ instead.
The parameter ``ssl_version`` specifies which version of the SSL protocol to The parameter ``ssl_version`` specifies which version of the SSL protocol to
use. Typically, the server chooses a particular protocol version, and the 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 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 interoperable with the other versions. If not specified, the default is
operation, the default SSL version is SSLv3; for server-side operation, :data:`PROTOCOL_SSLv23`; it provides the most compatibility with other
SSLv23. These version selections provide the most compatibility with other
versions. versions.
Here's a table showing which versions in a client (down the side) can connect 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** *client* / **server** **SSLv2** **SSLv3** **SSLv23** **TLSv1**
------------------------ --------- --------- ---------- --------- ------------------------ --------- --------- ---------- ---------
*SSLv2* yes no yes no *SSLv2* yes no yes no
*SSLv3* yes yes yes no *SSLv3* no yes yes no
*SSLv23* yes no yes no *SSLv23* yes no yes no
*TLSv1* no no yes yes *TLSv1* no no yes yes
======================== ========= ========= ========== ========= ======================== ========= ========= ========== =========