summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2016-09-06 18:06:47 (GMT)
committerChristian Heimes <christian@python.org>2016-09-06 18:06:47 (GMT)
commitd988f429fe43808345812ef63dfa8da170c61871 (patch)
treeb6cfaa64ec508879871d8046123dae51f4ad2a47 /Doc
parent499378f0879ad625b47f0873616d5efd19b80901 (diff)
downloadcpython-d988f429fe43808345812ef63dfa8da170c61871.zip
cpython-d988f429fe43808345812ef63dfa8da170c61871.tar.gz
cpython-d988f429fe43808345812ef63dfa8da170c61871.tar.bz2
Issues #27850 and #27766: Remove 3DES from ssl default cipher list and add ChaCha20 Poly1305.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ssl.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 61d40bf..5d254e7 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -280,6 +280,12 @@ purposes.
RC4 was dropped from the default cipher string.
+ .. versionchanged:: 2.7.13
+
+ ChaCha20/Poly1305 was added to the default cipher string.
+
+ 3DES was dropped from the default cipher string.
+
.. function:: _https_verify_certificates(enable=True)
Specifies whether or not server certificates are verified when creating