summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2016-09-06 18:07:58 (GMT)
committerChristian Heimes <christian@python.org>2016-09-06 18:07:58 (GMT)
commitac041c0aa721e2672dfb684562b08ad5465b76b1 (patch)
tree0dda587a7a25ea57331d9122d1ce0cd82f099f83 /Doc
parentd953f8e10bad887220d099676b36a86411afdf8f (diff)
parent03d13c0cbfe912eb0f9b9a02987b9e569f25fe19 (diff)
downloadcpython-ac041c0aa721e2672dfb684562b08ad5465b76b1.zip
cpython-ac041c0aa721e2672dfb684562b08ad5465b76b1.tar.gz
cpython-ac041c0aa721e2672dfb684562b08ad5465b76b1.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 892c0ea..3706a6e 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -285,6 +285,12 @@ purposes.
RC4 was dropped from the default cipher string.
+ .. versionchanged:: 3.6
+
+ ChaCha20/Poly1305 was added to the default cipher string.
+
+ 3DES was dropped from the default cipher string.
+
Random generation
^^^^^^^^^^^^^^^^^