summaryrefslogtreecommitdiffstats
path: root/Doc/library/ssl.rst
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-05-16 14:20:17 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-05-16 14:20:17 (GMT)
commit21b7e5316ca69f50f4b0a1b012e1c1c422f1e65a (patch)
treebf4190ea49043d2b305e9d025e47e4a52d289a98 /Doc/library/ssl.rst
parentd05f93da316e634aa2369e856fb04bf03fe39802 (diff)
downloadcpython-21b7e5316ca69f50f4b0a1b012e1c1c422f1e65a.zip
cpython-21b7e5316ca69f50f4b0a1b012e1c1c422f1e65a.tar.gz
cpython-21b7e5316ca69f50f4b0a1b012e1c1c422f1e65a.tar.bz2
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. ........ ................
Diffstat (limited to 'Doc/library/ssl.rst')
-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 702c52f..5c78345 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -219,6 +219,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