documented private extensions

3 files changed, 32 insertions, 4 deletions

diff --git a/doc/cha-bib.texi b/doc/cha-bib.texi
index 9acc86cce5..c5f71075c8 100644
--- a/doc/cha-bib.texi
+++ b/doc/cha-bib.texi
@@ -31,6 +31,11 @@ Tim Dierks and Christopher Allen, "The TLS Protocol Version 1.0",
 January 1999, Available from
 @url{http://www.ietf.org/rfc/rfc2246.txt}.
 
+@item @anchor{RFC4418}[RFC4418]
+Ted Krovetz, "UMAC: Message Authentication Code using Universal Hashing",
+March 2006, Available from
+@url{http://www.ietf.org/rfc/rfc4418.txt}.
+
 @item @anchor{RFC4680}[RFC4680]
 S. Santesson, "TLS Handshake Message for Supplemental Data",
 September 2006, Available from
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index 45f2fb028c..74adfeccb5 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -124,10 +124,6 @@ encryption (EDE). Has 64 bits block size and is used in CBC mode.
 ARCFOUR_128 is a compatible algorithm with RSA's RC4 algorithm, which is considered to be a trade
 secret. It is a fast cipher but considered weak today.
 
-@item ARCFOUR_@-40 @tab
-This is the ARCFOUR cipher fed with a 40 bit key,
-which is considered weak.
-
 @item AES_@-CBC @tab
 AES or RIJNDAEL is the block cipher algorithm that replaces the old
 DES algorithm.  Has 128 bits block size and is used in CBC mode.
@@ -142,6 +138,15 @@ This is an 128-bit block cipher developed by Mitsubishi and NTT. It
 is one of the approved ciphers of the European NESSIE and Japanese
 CRYPTREC projects.
 
+@item SALSA20_@-256 @tab
+SALSA20_256 is a fast stream cipher. This is currently a GnuTLS
+extension.
+
+@item ESTREAM_@-SALSA20_@-256 @tab
+ESTREAM_@-SALSA20_@-256 is a faster variant of SALSA20, and is one of the 
+selected ciphers of the ESTREAM competition. This is currently a GnuTLS
+extension.
+
 @end multitable
 @caption{Supported ciphers.}
 @end float
@@ -161,6 +166,10 @@ designed by NSA. Outputs 160 bits of data.
 @item MAC_@-SHA256 @tab
 An HMAC based on SHA256. Outputs 256 bits of data.
 
+@item MAC_@-UMAC @tab
+This is a very fast MAC algorithm based on universal hashing, described in
+@xcite{RFC4418}. This is currently a GnuTLS extension.
+
 @item MAC_@-AEAD @tab
 This indicates that an authenticated encryption algorithm, such as
 GCM, is in use.
diff --git a/doc/latex/gnutls.bib b/doc/latex/gnutls.bib
index fd0d7bc91c..8a9a22c861 100644
--- a/doc/latex/gnutls.bib
+++ b/doc/latex/gnutls.bib
@@ -400,3 +400,17 @@
   note = "Work in progress, available from \url{http://tools.ietf.org/html/draft-mavrogiannopoulos-tpmuri-01}",
   url = "http://tools.ietf.org/html/draft-mavrogiannopoulos-tpmuri-01"
 }
+
+@misc{rfc4418,
+  author="T. Krovetz",
+  title="{UMAC: Message Authentication Code using Universal Hashing}",
+  series="Request for Comments",
+  number="4418",
+  howpublished="RFC 4418 (Informational)",
+  publisher="IETF",
+  organization="Internet Engineering Task Force",
+  year=2006,
+  month=mar,
+    url="http://www.ietf.org/rfc/rfc4418.txt",
+}
+