]> granicus.if.org Git - python/commitdiff
Fix #22987: update the compatibility matrix for a SSLv23 client.
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 3 Dec 2014 19:00:56 +0000 (20:00 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 3 Dec 2014 19:00:56 +0000 (20:00 +0100)
Doc/library/ssl.rst

index e6398ae7543d196ef2e49b42211878483dca9a25..1c2cbba0d8374929f15d0d6ac31a9e559e8ab514 100644 (file)
@@ -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