From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 14 May 2011 17:49:54 +0000 (+0200)
Subject: discuss missing algorithms.
X-Git-Tag: gnutls_2_99_2~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbb7ed719436a433b5828fbe5723c0935bb93a74;p=thirdparty%2Fgnutls.git

discuss missing algorithms.
---

diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index 2f1cf3417b..94cd31c5be 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -192,8 +192,15 @@ DES algorithm.  Has 128 bits block size and is used in CBC mode.
 @item AES_GCM
 This is the AES algorithm in the authenticated encryption GCM mode.
 This mode combines message authentication and encryption.
+
+@item CAMELLIA_CBC
+CAMELLIA is an 128-bit block cipher developed by Mitsubish and NTT. It
+is one of the approved ciphers of the European NESSIE and Japanese
+CRYPTREC projects.
+
 @end table
 
+
 Supported MAC algorithms:
 
 @table @code
@@ -205,6 +212,14 @@ MD5 is a cryptographic hash algorithm designed by Ron Rivest. Outputs
 SHA is a cryptographic hash algorithm designed by NSA. Outputs 160
 bits of data.
 
+@item MAC_SHA256
+SHA256 is a cryptographic hash algorithm designed by NSA. Outputs 256
+bits of data.
+
+@item MAC_AEAD
+This indicates that an authenticated encryption algorithm, such as
+GCM, is in use.
+
 @end table
 
 @node Compression algorithms used in the record layer
@@ -235,6 +250,9 @@ The supported compression algorithms are:
 @item DEFLATE
 Zlib compression, using the deflate algorithm.
 
+@item NULL
+No compression.
+
 @end table
 
 @node Weaknesses and countermeasures