From 33a500ea14286b0d42c3ad63df8b88b3849b33a3 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Wed, 24 May 2017 11:55:25 -0400 Subject: [PATCH] Add aes-sha2 enctypes to aes family documentation 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/admin/conf_files/kdc_conf.rst b/doc/admin/conf_files/kdc_conf.rst index d57723d129..4def01f041 100644 --- a/doc/admin/conf_files/kdc_conf.rst +++ b/doc/admin/conf_files/kdc_conf.rst @@ -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 ==================================================== ========================================================= -- 2.47.2