[Python-checkins] r81232 - in python/branches/release31-maint: Doc/library/ssl.rst

antoine.pitrou python-checkins at python.org
Sun May 16 16:20:17 CEST 2010


Author: antoine.pitrou
Date: Sun May 16 16:20:17 2010
New Revision: 81232

Log:
Merged revisions 81231 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81231 | antoine.pitrou | 2010-05-16 16:19:41 +0200 (dim., 16 mai 2010) | 9 lines
  
  Merged revisions 81229 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r81229 | antoine.pitrou | 2010-05-16 16:16:56 +0200 (dim., 16 mai 2010) | 3 lines
    
    Document that SSL v2 is insecure.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/ssl.rst

Modified: python/branches/release31-maint/Doc/library/ssl.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/ssl.rst	(original)
+++ python/branches/release31-maint/Doc/library/ssl.rst	Sun May 16 16:20:17 2010
@@ -219,6 +219,10 @@
 
    Selects SSL version 2 as the channel encryption protocol.
 
+   .. warning::
+
+      SSL version 2 is insecure.  Its use is highly discouraged.
+
 .. data:: PROTOCOL_SSLv23
 
    Selects SSL version 2 or 3 as the channel encryption protocol.  This is a


More information about the Python-checkins mailing list