aboutsummaryrefslogtreecommitdiffstats
path: root/doc/manual
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-11-03 11:19:42 -0400
committerJack Lloyd <[email protected]>2017-11-03 11:19:42 -0400
commit129fb36cab63863ad2b697900666f6d088c3c76c (patch)
tree9656509d27df0bd5e880411e4b284310651c7b32 /doc/manual
parent5de6a1d97996ba5ec150ea0f4b4c374681668b68 (diff)
Add support for ARIA GCM ciphersuites
Tested against OpenSSL master
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/tls.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/manual/tls.rst b/doc/manual/tls.rst
index 4d7cc7e08..aa075141d 100644
--- a/doc/manual/tls.rst
+++ b/doc/manual/tls.rst
@@ -805,7 +805,8 @@ policy settings from a file.
"AES-256/CCM", "AES-128/CCM", "AES-256", "AES-128"
Also allowed: "AES-256/CCM(8)", "AES-128/CCM(8)",
- "Camellia-256/GCM", "Camellia-128/GCM", "Camellia-256", "Camellia-128"
+ "Camellia-256/GCM", "Camellia-128/GCM", "ARIA-256/GCM", "ARIA-128/GCM",
+ "Camellia-256", "Camellia-128"
Also allowed (though currently experimental): "AES-128/OCB(12)",
"AES-256/OCB(12)"