]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Add aes-sha2 enctypes to aes family documentation
authorRobbie Harwood <rharwood@redhat.com>
Wed, 24 May 2017 15:55:25 +0000 (11:55 -0400)
committerGreg Hudson <ghudson@mit.edu>
Mon, 17 Jul 2017 23:05:54 +0000 (19:05 -0400)
The functional portion of this change was made in commit
d1ec317288278d10ae34fde9b2414e4fca5c52dd.

(cherry picked from commit 33a500ea14286b0d42c3ad63df8b88b3849b33a3)

ticket: 8585
version_fixed: 1.15.2

doc/admin/conf_files/kdc_conf.rst

index 13077ecf4bc2900d2a9e7f3585873ebedbdc5ee7..4e54f7e1d3fc69533e2529ae0a8b0146aa30eb4b 100644 (file)
@@ -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
 ==================================================== =========================================================