diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-11-14 16:49:33 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-11-14 16:49:59 -0500 |
| commit | 8f27ae9d0afb81f851ff56523882de3524031b9b (patch) | |
| tree | b692aa45048dea0307a9f902694b5bcb726f9e6a /doc/conf.py | |
| parent | b1ba4ac45345d93ecbba22626843b06f32b2262d (diff) | |
| download | krb5-8f27ae9d0afb81f851ff56523882de3524031b9b.tar.gz krb5-8f27ae9d0afb81f851ff56523882de3524031b9b.tar.xz krb5-8f27ae9d0afb81f851ff56523882de3524031b9b.zip | |
Add Camellia enctypes to default enctype lists
Add camellia256-cts-cmas and camellia128-cts-cmac to the default
permitted_enctypes, default_tkt_enctypes, and default_tgs_enctypes
lists, to simplify deployment of Camellia. The new enctypes still
aren't on supported_enctypes, so won't be in the set of long-term keys
for principals without administrator intervention.
ticket: 7446 (new)
target_version: 1.11
tags: pullup
Diffstat (limited to 'doc/conf.py')
| -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 f441f7ec4..2ad76fd96 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -267,7 +267,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 des-cbc-crc des-cbc-md5 des-cbc-md4`` +.. |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`` .. |defmkey| replace:: ``aes256-cts-hmac-sha1-96`` .. |copy| unicode:: U+000A9 ''' |