summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2011-02-08 22:36:48 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-02-08 22:36:48 +0100
commiteeb9677e709ec22f9cf7b286e5e5fc07092c0f3f (patch)
tree8c9eb3ff5204fc3711ecdb14c4b4b0476190f8ba /doc
parent4e509d7ec515f36d954c54ec28b9e8ef9b3d8486 (diff)
downloadgnutls-eeb9677e709ec22f9cf7b286e5e5fc07092c0f3f.tar.gz
removed GCM mode from documentation.
Diffstat (limited to 'doc')
-rw-r--r--doc/cha-intro-tls.texi5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index 0535234a7f..fd332b74df 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -386,7 +386,7 @@ appended with an algorithm will add this algorithm.
Individual algorithms:
@table @asis
@item Ciphers:
-AES-128-CBC, AES-256-CBC, AES-128-GCM, CAMELLIA-128-CBC,
+AES-128-CBC, AES-256-CBC, CAMELLIA-128-CBC,
CAMELLIA-256-CBC, ARCFOUR-128, 3DES-CBC ARCFOUR-40. Catch all
name is CIPHER-ALL which will add all the non-weak algorithms, i.e.
all except ARCFOUR-40.
@@ -397,8 +397,7 @@ PSK, DHE-PSK, ANON-DH, RSA-EXPORT. The
key exchange methods do not have a catch all.
@item MAC:
-MD5, SHA1, SHA256, AEAD (used with
-GCM ciphers only). Catch all is MAC-ALL.
+MD5, SHA1, SHA256. Catch all is MAC-ALL.
@item Compression algorithms:
COMP-NULL, COMP-DEFLATE. Catch all is COMP-ALL.