From: Robbie Harwood Date: Wed, 24 May 2017 15:55:25 +0000 (-0400) Subject: Add aes-sha2 enctypes to aes family documentation X-Git-Tag: krb5-1.15.2-final~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e1b77b573c56af5656dc2e671ee3a425fb7876b;p=thirdparty%2Fkrb5.git Add aes-sha2 enctypes to aes family documentation The functional portion of this change was made in commit d1ec317288278d10ae34fde9b2414e4fca5c52dd. (cherry picked from commit 33a500ea14286b0d42c3ad63df8b88b3849b33a3) ticket: 8585 version_fixed: 1.15.2 --- diff --git a/doc/admin/conf_files/kdc_conf.rst b/doc/admin/conf_files/kdc_conf.rst index 13077ecf4b..4e54f7e1d3 100644 --- a/doc/admin/conf_files/kdc_conf.rst +++ b/doc/admin/conf_files/kdc_conf.rst @@ -824,7 +824,7 @@ camellia256-cts-cmac camellia256-cts Camellia-256 CTS mode with 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 +aes The AES family: aes256-cts-hmac-sha1-96, aes128-cts-hmac-sha1-96, aes256-cts-hmac-sha384-192, and aes128-cts-hmac-sha256-128 rc4 The RC4 family: arcfour-hmac camellia The Camellia family: camellia256-cts-cmac and camellia128-cts-cmac ==================================================== =========================================================