aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorlloyd <[email protected]>2015-05-15 02:33:57 +0000
committerlloyd <[email protected]>2015-05-15 02:33:57 +0000
commit12eea2e817528e7d1a85e5e80b360eead6e5d206 (patch)
tree3ec765c23a0a573933da8f53d63d63b8b2e71c74 /doc
parent99506e5ba968d30d4015bc72bea8f515bfee8287 (diff)
Remove RC4 (and all support for stream ciphers) from TLS
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/tls.rst4
-rw-r--r--doc/relnotes/index.rst2
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/manual/tls.rst b/doc/manual/tls.rst
index 16fced4ea..26ac6a801 100644
--- a/doc/manual/tls.rst
+++ b/doc/manual/tls.rst
@@ -527,11 +527,11 @@ policy settings from a file.
Also allowed (though currently experimental): "AES-128/OCB(12)",
"AES-256/OCB(12)"
- Also allowed (although **not recommended**): "SEED", "3DES", "RC4"
+ Also allowed (although **not recommended**): "SEED", "3DES"
.. note::
- RC4 will never be negotiated in DTLS due to protocol limitations
+ Support for the broken RC4 cipher was removed in 1.11.17
.. cpp:function:: std::vector<std::string> allowed_macs() const
diff --git a/doc/relnotes/index.rst b/doc/relnotes/index.rst
index 896b70479..f94a0bfea 100644
--- a/doc/relnotes/index.rst
+++ b/doc/relnotes/index.rst
@@ -8,6 +8,8 @@ Series 1.11
.. toctree::
:maxdepth: 1
+ 1_11_17
+ 1_11_16
1_11_15
1_11_14
1_11_13