summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-04-08 15:11:45 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-04-08 15:11:45 (GMT)
commitf1c5dea3c29d398ab58b45dd152a032489eddf58 (patch)
tree009222b873ad4c1da33d8b6ba193db7d21fd9cca
parent291d7b0284c879b727e6f1c0d0c35a062c316a3a (diff)
parent6f362fa6c83abe4c8bdbd7dfd2f27e777995f765 (diff)
downloadcpython-f1c5dea3c29d398ab58b45dd152a032489eddf58.zip
cpython-f1c5dea3c29d398ab58b45dd152a032489eddf58.tar.gz
cpython-f1c5dea3c29d398ab58b45dd152a032489eddf58.tar.bz2
merge 3.4
-rw-r--r--Doc/library/ssl.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index ccaa183..c22b071 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -263,13 +263,13 @@ purposes.
.. note::
If you find that when certain older clients or servers attempt to connect
- with a :class:`SSLContext` created by this function that they get an
- error stating "Protocol or cipher suite mismatch", it may be that they
- only support SSL3.0 which this function excludes using the
- :data:`OP_NO_SSLv3`. SSL3.0 has problematic security due to a number of
- poor implementations and it's reliance on MD5 within the protocol. If you
- wish to continue to use this function but still allow SSL 3.0 connections
- you can re-enable them using::
+ with a :class:`SSLContext` created by this function that they get an error
+ stating "Protocol or cipher suite mismatch", it may be that they only
+ support SSL3.0 which this function excludes using the
+ :data:`OP_NO_SSLv3`. SSL3.0 is widely considered to be `completely broken
+ <https://en.wikipedia.org/wiki/POODLE>`_. If you still wish to continue to
+ use this function but still allow SSL 3.0 connections you can re-enable
+ them using::
ctx = ssl.create_default_context(Purpose.CLIENT_AUTH)
ctx.options &= ~ssl.OP_NO_SSLv3