krb5 commit: Regenerate kdc.conf.man to pick up Camellia

Benjamin Kaduk kaduk at MIT.EDU
Wed Nov 14 14:03:02 EST 2012


https://github.com/krb5/krb5/commit/e89f6c6532787cf8e90ee80bdbb05e8abc13c565
commit e89f6c6532787cf8e90ee80bdbb05e8abc13c565
Author: Ben Kaduk <kaduk at 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.
    
    ticket: 7439
    tags: pullup

 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


More information about the cvs-krb5 mailing list