summaryrefslogtreecommitdiff
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-05-10 01:52:03 +0200
committerVictor Stinner <victor.stinner@haypocalc.com>2011-05-10 01:52:03 +0200
commitd04aae080f4ec96db68494c659da5d4579e972ba (patch)
tree44d09eb66cf6206b3c762f170e15aa2193aa46db /Doc
parenta5c3962c4b40d84039b9e48dbe82ed82712fde72 (diff)
downloadcpython-d04aae080f4ec96db68494c659da5d4579e972ba.tar.gz
(Merge 3.1) Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional
OpenSSL is now compiled with OPENSSL_NO_SSL2 defined (without the SSLv2 protocol) on Debian: fix the ssl module on Debian Testing and Debian Sid. Optimize also ssl.get_protocol_name(): speed does matter!
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ssl.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index a7e78bd6e2..f4cac3a14a 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -237,6 +237,9 @@ Functions, Constants, and Exceptions
Selects SSL version 2 as the channel encryption protocol.
+ This protocol is not available if OpenSSL is compiled with OPENSSL_NO_SSL2
+ flag.
+
.. warning::
SSL version 2 is insecure. Its use is highly discouraged.