[27260] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.11]: Regenerate kdc.conf.man to pick up Camellia
daemon@ATHENA.MIT.EDU (Tom Yu)
Fri Nov 16 14:58:21 2012
Date: Fri, 16 Nov 2012 14:58:18 -0500
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201211161958.qAGJwImO022235@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/60f4c145c42c7575aef6950674bb170aa505c301
commit 60f4c145c42c7575aef6950674bb170aa505c301
Author: Ben Kaduk <kaduk@mit.edu>
Date: Wed Nov 14 14:01:30 2012 -0500
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.
(cherry picked from commit e89f6c6532787cf8e90ee80bdbb05e8abc13c565)
ticket: 7439
status: resolved
src/man/kdc.conf.man | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/man/kdc.conf.man b/src/man/kdc.conf.man
index c821190..1991fce 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
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
