summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2014-10-17 17:28:30 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2014-10-17 17:28:30 (GMT)
commita21de3d45ec2aebf899712cbd0e44eba9611d2af (patch)
treed965b0538462d49591923a6a89a0bedd9ba06eb3
parentf8c3b69986a6e544c13b659efb1084b075f7cf34 (diff)
downloadcpython-a21de3d45ec2aebf899712cbd0e44eba9611d2af.zip
cpython-a21de3d45ec2aebf899712cbd0e44eba9611d2af.tar.gz
cpython-a21de3d45ec2aebf899712cbd0e44eba9611d2af.tar.bz2
Issue #22638: SSLv3 is now disabled throughout the standard library.
It can still be enabled by instantiating a SSLContext manually.
-rw-r--r--Lib/ssl.py3
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index b6e6f16..2b81b79 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -458,6 +458,9 @@ def _create_unverified_context(protocol=PROTOCOL_SSLv23, *, cert_reqs=None,
context = SSLContext(protocol)
# SSLv2 considered harmful.
context.options |= OP_NO_SSLv2
+ # SSLv3 has problematic security and is only required for really old
+ # clients such as IE6 on Windows XP
+ context.options |= OP_NO_SSLv3
if cert_reqs is not None:
context.verify_mode = cert_reqs
diff --git a/Misc/NEWS b/Misc/NEWS
index 275e859..2d131bd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,9 @@ Core and Builtins
Library
-------
+- Issue #22638: SSLv3 is now disabled throughout the standard library.
+ It can still be enabled by instantiating a SSLContext manually.
+
- Issue #22370: Windows detection in pathlib is now more robust.
- Issue #22841: Reject coroutines in asyncio add_signal_handler().