[27234] in CVS-changelog-for-Kerberos-V5
krb5 commit: Add Camellia to enctype table in documentation
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Nov 2 11:15:11 2012
Date: Fri, 2 Nov 2012 11:13:20 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201211021513.qA2FDKhn019443@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/d8ce486d746bc2745a71a8469033f55c9533e575
commit d8ce486d746bc2745a71a8469033f55c9533e575
Author: Greg Hudson <ghudson@mit.edu>
Date: Fri Nov 2 11:12:38 2012 -0400
Add Camellia to enctype table in documentation
ticket: 7439 (new)
target_version: 1.11
tags: pullup
doc/admins/conf_files/kdc_conf.rst | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/doc/admins/conf_files/kdc_conf.rst b/doc/admins/conf_files/kdc_conf.rst
index 7ded12d..4da8d93 100644
--- a/doc/admins/conf_files/kdc_conf.rst
+++ b/doc/admins/conf_files/kdc_conf.rst
@@ -619,10 +619,13 @@ aes256-cts-hmac-sha1-96 aes256-cts AES-256 CTS mode with 96-bit SHA-1
aes128-cts-hmac-sha1-96 aes128-cts AES-128 CTS mode with 96-bit SHA-1 HMAC
arcfour-hmac rc4-hmac arcfour-hmac-md5 RC4 with HMAC/MD5
arcfour-hmac-exp rc4-hmac-exp arcfour-hmac-md5-exp Exportable RC4 with HMAC/MD5 (weak)
+camellia256-cts-cmac camellia256-cts Camellia-256 CTS mode with CMAC
+camellia128-cts-cmac camellia128-cts Camellia-128 CTS mode with CMAC
des The DES family: des-cbc-crc, des-cbc-md5, and des-cbc-md4 (weak)
des3 The triple DES family: des3-cbc-sha1
aes The AES family: aes256-cts-hmac-sha1-96 and aes128-cts-hmac-sha1-96
rc4 The RC4 family: arcfour-hmac
+camellia The Camellia family: camellia256-cts-cmac and camellia128-cts-cmac
==================================================== =========================================================
The string **DEFAULT** 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
