From: Greg Hudson Date: Wed, 11 Oct 2017 17:19:03 +0000 (-0400) Subject: Fix default enctype order in docs X-Git-Tag: krb5-1.17-beta1~207 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F706%2Fhead;p=thirdparty%2Fkrb5.git Fix default enctype order in docs Commit 4c234d8754c063177bc627c6298b85020d91c223 added the aes-sha2 enctypes to the documented default enctypes, but in the wrong order. Reported by Weijun Wang. ticket: 8616 (new) target_version: 1.15-next target_version: 1.16 tags: pullup --- diff --git a/doc/conf.py b/doc/conf.py index 8b7fe7fb6b..ccd02d6b7e 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -272,7 +272,7 @@ else: 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`` -.. |defetypes| replace:: ``aes256-cts-hmac-sha1-96 aes128-cts-hmac-sha1-96 aes128-cts-hmac-sha256-128 aes256-cts-hmac-sha384-192 des3-cbc-sha1 arcfour-hmac-md5 camellia256-cts-cmac camellia128-cts-cmac des-cbc-crc des-cbc-md5 des-cbc-md4`` +.. |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 '''