From: Greg Hudson Date: Fri, 2 Nov 2012 15:12:38 +0000 (-0400) Subject: Add Camellia to enctype table in documentation X-Git-Tag: krb5-1.12-alpha1~491 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8ce486d746bc2745a71a8469033f55c9533e575;p=thirdparty%2Fkrb5.git Add Camellia to enctype table in documentation ticket: 7439 (new) target_version: 1.11 tags: pullup --- diff --git a/doc/admins/conf_files/kdc_conf.rst b/doc/admins/conf_files/kdc_conf.rst index 7ded12dc0f..4da8d936f2 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