[30073] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.15]: Fix default enctype order in docs
daemon@ATHENA.MIT.EDU (Greg Hudson)
Wed Nov 22 13:11:06 2017
Date: Wed, 22 Nov 2017 13:10:58 -0500
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201711221810.vAMIAwPE019507@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/0743a4945fa49df210262958778c7daec3a9b851
commit 0743a4945fa49df210262958778c7daec3a9b851
Author: Greg Hudson <ghudson@mit.edu>
Date: Wed Oct 11 13:19:03 2017 -0400
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.
(cherry picked from commit e4ffb911497ecd3348c89fb459cc8ccae40bfe42)
ticket: 8616
version_fixed: 1.15.3
doc/conf.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/doc/conf.py b/doc/conf.py
index 8b7fe7f..ccd02d6 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
'''
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
