aboutsummaryrefslogtreecommitdiffstats
path: root/doc/manual/tls.rst
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-01-04 12:08:23 -0500
committerJack Lloyd <[email protected]>2016-01-04 12:08:23 -0500
commit49850af444825fa347d4bc863cb2ee02e17d5ae8 (patch)
tree7a5a3d4034e7e016e7a7a90773571e950801d8a6 /doc/manual/tls.rst
parentec326f7e2afa7553c646e5ed841e924a43216850 (diff)
Misc doc updates
[ci skip]
Diffstat (limited to 'doc/manual/tls.rst')
-rw-r--r--doc/manual/tls.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/manual/tls.rst b/doc/manual/tls.rst
index 5f96816a8..c5be39aaa 100644
--- a/doc/manual/tls.rst
+++ b/doc/manual/tls.rst
@@ -534,6 +534,13 @@ policy settings from a file.
.. note::
+ The current ChaCha20Poly1305 ciphersuites are non-standard but
+ as of 2015 were implemented and deployed by Google and
+ elsewhere. Support will be changed to using IETF standard
+ ChaCha20Poly1305 ciphersuites when those are defined.
+
+ .. note::
+
Support for the broken RC4 cipher was removed in 1.11.17
.. cpp:function:: std::vector<std::string> allowed_macs() const