summaryrefslogtreecommitdiffstats
path: root/src/man
diff options
context:
space:
mode:
authorBen Kaduk <kaduk@mit.edu>2012-11-14 14:01:30 -0500
committerBen Kaduk <kaduk@mit.edu>2012-11-14 14:01:30 -0500
commite89f6c6532787cf8e90ee80bdbb05e8abc13c565 (patch)
tree8b9c9e5e1018bbe451e9df95c37f6df1152ff4f8 /src/man
parent2df36dd4a52c2b08fbacf1648dc76e8e313ce1b5 (diff)
downloadkrb5-e89f6c6532787cf8e90ee80bdbb05e8abc13c565.tar.gz
krb5-e89f6c6532787cf8e90ee80bdbb05e8abc13c565.tar.xz
krb5-e89f6c6532787cf8e90ee80bdbb05e8abc13c565.zip
Regenerate kdc.conf.man to pick up Camellia
We recently added documentation of the Camellia enctypes; rebuild the in-tree man page to pick them up. ticket: 7439 tags: pullup
Diffstat (limited to 'src/man')
-rw-r--r--src/man/kdc.conf.man18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/man/kdc.conf.man b/src/man/kdc.conf.man
index c82119032e..1991fceff2 100644
--- a/src/man/kdc.conf.man
+++ b/src/man/kdc.conf.man
@@ -745,6 +745,18 @@ Exportable RC4 with HMAC/MD5 (weak)
T}
_
T{
+camellia256\-cts\-cmac camellia256\-cts
+T} T{
+Camellia\-256 CTS mode with CMAC
+T}
+_
+T{
+camellia128\-cts\-cmac camellia128\-cts
+T} T{
+Camellia\-128 CTS mode with CMAC
+T}
+_
+T{
des
T} T{
The DES family: des\-cbc\-crc, des\-cbc\-md5, and des\-cbc\-md4 (weak)
@@ -768,6 +780,12 @@ T} T{
The RC4 family: arcfour\-hmac
T}
_
+T{
+camellia
+T} T{
+The Camellia family: camellia256\-cts\-cmac and camellia128\-cts\-cmac
+T}
+_
.TE
.sp
The string \fBDEFAULT\fP can be used to refer to the default set of