diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2014-12-03 19:00:56 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2014-12-03 19:00:56 (GMT) |
commit | 2b207badd64435e75b653e04c0b51be856f4eea9 (patch) | |
tree | dbf18eae8d271edda9b72d191f6e35642b258409 /Doc | |
parent | 1ad088f3ea14f4b598040e1d266e2567aa260dea (diff) | |
download | cpython-2b207badd64435e75b653e04c0b51be856f4eea9.zip cpython-2b207badd64435e75b653e04c0b51be856f4eea9.tar.gz cpython-2b207badd64435e75b653e04c0b51be856f4eea9.tar.bz2 |
Fix #22987: update the compatibility matrix for a SSLv23 client.
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/ssl.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 11058ae..a997a32 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -192,7 +192,7 @@ instead. ------------------------ --------- --------- ---------- --------- ----------- ----------- *SSLv2* yes no yes no no no *SSLv3* no yes yes no no no - *SSLv23* yes no yes no no no + *SSLv23* no yes yes yes yes yes *TLSv1* no no yes yes no no *TLSv1.1* no no yes no yes no *TLSv1.2* no no yes no no yes @@ -201,9 +201,8 @@ instead. .. note:: Which connections succeed will vary depending on the version of - OpenSSL. For example, beginning with OpenSSL 1.0.0, an SSLv23 client - will not actually attempt SSLv2 connections unless you explicitly - enable SSLv2 ciphers (which is not recommended, as SSLv2 is broken). + OpenSSL. For example, before OpenSSL 1.0.0, an SSLv23 client + would always attempt SSLv2 connections. The *ciphers* parameter sets the available ciphers for this SSL object. It should be a string in the `OpenSSL cipher list format |