From: Ben Kaduk <kaduk@mit.edu>
Date: Wed, 14 Nov 2012 19:01:30 +0000 (-0500)
Subject: Regenerate kdc.conf.man to pick up Camellia
X-Git-Tag: krb5-1.12-alpha1~489
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e89f6c6532787cf8e90ee80bdbb05e8abc13c565;p=thirdparty%2Fkrb5.git

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
---

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