diff options
| author | Greg Hudson <ghudson@mit.edu> | 2017-06-21 13:10:51 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2017-07-17 20:00:06 -0400 |
| commit | e401a4bdbdcbec192f33ab288e99b5068f907081 (patch) | |
| tree | ba303cb1d084796a480149c838b5360423aa4d09 | |
| parent | 902d335537b67061ba4c61193592fe556a8fe295 (diff) | |
| download | krb5-e401a4bdbdcbec192f33ab288e99b5068f907081.zip krb5-e401a4bdbdcbec192f33ab288e99b5068f907081.tar.gz krb5-e401a4bdbdcbec192f33ab288e99b5068f907081.tar.bz2 | |
Add aes-sha2 to default enctypes in docs
Commit d1ec317288278d10ae34fde9b2414e4fca5c52dd added aes-sha2 to the
default permitted enctype lists and the aes family, but didn't update
the documentation. Commit 33a500ea14286b0d42c3ad63df8b88b3849b33a3
updated the documentation for the aes family, but not for the default
enctype lists. Reported by Weijun Wang.
(cherry picked from commit 4c234d8754c063177bc627c6298b85020d91c223)
ticket: 8593
version_fixed: 1.15.2
| -rw-r--r-- | doc/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/conf.py b/doc/conf.py index 3ee2df6..8b7fe7f 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 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 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`` .. |defmkey| replace:: ``aes256-cts-hmac-sha1-96`` .. |copy| unicode:: U+000A9 ''' |