summaryrefslogtreecommitdiff
path: root/doc/cha-intro-tls.texi
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2015-12-22 11:30:52 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2015-12-22 11:38:54 +0200
commit8a776077e889b2f720d130528b2924f149545863 (patch)
treee4fdee7e992a34e0d7025289adb99f06d27f84f2 /doc/cha-intro-tls.texi
parent4d6f22d7a635a1e3430287134507d843ec270aed (diff)
downloadgnutls-8a776077e889b2f720d130528b2924f149545863.tar.gz
Added SHA384 to the list of TLS support MAC algorithms
Diffstat (limited to 'doc/cha-intro-tls.texi')
-rw-r--r--doc/cha-intro-tls.texi9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index 6df52ab86b..22e86f8e0f 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -156,7 +156,7 @@ ARCFOUR-128 is a compatible algorithm with RSA's RC4 algorithm, which is conside
secret. It is a fast cipher but considered weak today, and thus it is not enabled by default.
@end multitable
-@caption{Supported ciphers.}
+@caption{Supported ciphers in TLS.}
@end float
@@ -172,14 +172,17 @@ An HMAC based on the SHA1 cryptographic hash algorithm
designed by NSA. Outputs 160 bits of data.
@item MAC_@-SHA256 @tab
-An HMAC based on SHA256. Outputs 256 bits of data.
+An HMAC based on SHA2-256. Outputs 256 bits of data.
+
+@item MAC_@-SHA384 @tab
+An HMAC based on SHA2-384. Outputs 384 bits of data.
@item MAC_@-AEAD @tab
This indicates that an authenticated encryption algorithm, such as
GCM, is in use.
@end multitable
-@caption{Supported MAC algorithms.}
+@caption{Supported MAC algorithms in TLS.}
@end float