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

ticket: 8585 (new)
target_version: 1.15-next
tags: pullup

doc/admin/conf_files/kdc_conf.rst

index d57723d129a2dc086e8b5875d79284c94b79f905..4def01f041970ce257b55e6501c3ed515faca762 100644 (file)
@@ -829,7 +829,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
 ==================================================== =========================================================