aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2020-11-23 15:40:59 -0500
committerJack Lloyd <[email protected]>2020-11-23 15:45:33 -0500
commit30cf6284db5b5bedb460293fa456cc80b4cc5be4 (patch)
treeca2fb318d41991d35e8befb1a892bc58a2ed8d18 /doc
parentdd37103ba35c6a8905f477ee94df254c5a835eba (diff)
Update TLS docs
Diffstat (limited to 'doc')
-rw-r--r--doc/api_ref/tls.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/api_ref/tls.rst b/doc/api_ref/tls.rst
index 8ed214eb8..e4d497a1a 100644
--- a/doc/api_ref/tls.rst
+++ b/doc/api_ref/tls.rst
@@ -854,8 +854,7 @@ policy settings from a file.
Also allowed: "AES-256", "AES-128",
"AES-256/CCM", "AES-128/CCM", "AES-256/CCM(8)", "AES-128/CCM(8)",
- "Camellia-256/GCM", "Camellia-128/GCM", "ARIA-256/GCM", "ARIA-128/GCM",
- "Camellia-256", "Camellia-128"
+ "Camellia-256/GCM", "Camellia-128/GCM", "ARIA-256/GCM", "ARIA-128/GCM"
Also allowed (though currently experimental): "AES-128/OCB(12)",
"AES-256/OCB(12)"
@@ -863,7 +862,7 @@ policy settings from a file.
In versions up to 2.8.0, the CBC and CCM ciphersuites "AES-256",
"AES-128", "AES-256/CCM" and "AES-128/CCM" were enabled by default.
- Also allowed (although **not recommended**): "SEED", "3DES"
+ Also allowed (although **not recommended**): "3DES"
.. note::
@@ -877,7 +876,7 @@ policy settings from a file.
.. note::
- SEED and 3DES are deprecated and will be removed in a future release.
+ All CBC ciphersuites are deprecated and will be removed in a future release.
.. cpp:function:: std::vector<std::string> allowed_macs() const