]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Update supported_enctypes documentation
authorRobbie Harwood <rharwood@redhat.com>
Fri, 20 Sep 2019 17:09:04 +0000 (13:09 -0400)
committerGreg Hudson <ghudson@mit.edu>
Mon, 9 Dec 2019 22:02:52 +0000 (17:02 -0500)
In commit 38a31852c3e58f6e2f6b3b035a87f817d1db5537, the aes-sha1
enctypes became the only defaults, but the documentation was not
updated.

(cherry picked from commit 56982b666e10fbb47c1fb70947b3e176c9a5e2d1)

ticket: 8834
version_fixed: 1.17.1

doc/conf.py

index c32e3300166d1179201e8cf2f9455a8747003fda..7c688d87109734298fc2a1d342d8a3628949ccf1 100644 (file)
@@ -271,7 +271,7 @@ else:
     rst_epilog += '.. |ckeytab| replace:: %s\n' % ckeytab
     rst_epilog += '''
 .. |krb5conf| replace:: ``/etc/krb5.conf``
-.. |defkeysalts| replace:: ``aes256-cts-hmac-sha1-96:normal aes128-cts-hmac-sha1-96:normal des3-cbc-sha1:normal arcfour-hmac-md5:normal``
+.. |defkeysalts| replace:: ``aes256-cts-hmac-sha1-96:normal aes128-cts-hmac-sha1-96:normal``
 .. |defetypes| replace:: ``aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 aes256-cts-hmac-sha384-192 aes128-cts-hmac-sha256-128 des3-cbc-sha1 arcfour-hmac-md5 camellia256-cts-cmac camellia128-cts-cmac des-cbc-crc des-cbc-md5 des-cbc-md4``
 .. |defmkey| replace:: ``aes256-cts-hmac-sha1-96``
 .. |copy| unicode:: U+000A9