[Python-checkins] cpython (merge 3.4 -> default): Fix #22987: update the compatibility matrix for a SSLv23 client.

[antoine.pitrou]

https://hg.python.org/cpython/rev/7509a0607c40
changeset:   93714:7509a0607c40
parent:      93711:334c01aa7f93
parent:      93713:9f03572690d2
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Dec 03 20:03:11 2014 +0100
summary:
  Fix #22987: update the compatibility matrix for a SSLv23 client.

files:
  Doc/library/ssl.rst |  7 +++----
  1 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -192,7 +192,7 @@
        ------------------------  ---------  ---------  ----------  ---------  -----------  -----------
         *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 @@
    .. 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

-- 
Repository URL: https://hg.python.org/cpython