summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-16 14:19:41 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-16 14:19:41 (GMT)
commit8eac60d9af6eea5f53a589eddc5f7efbf86385ba (patch)
treeed2c46a9c5159f39f4ea5bb4a69d81cac3144c52 /Doc
parent7ac5cb18df3b9778d55aaf673da7c49f1666b4c9 (diff)
downloadcpython-8eac60d9af6eea5f53a589eddc5f7efbf86385ba.zip
cpython-8eac60d9af6eea5f53a589eddc5f7efbf86385ba.tar.gz
cpython-8eac60d9af6eea5f53a589eddc5f7efbf86385ba.tar.bz2
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. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ssl.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 2a7d6eb..95f5f70 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -231,6 +231,10 @@ Functions, Constants, and Exceptions
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