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 /src/lib | |
| 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 'src/lib')
| -rw-r--r-- | src/lib/krb5/krb/init_ctx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index aa793fc8f3..6054b2056e 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -63,6 +63,7 @@ static krb5_enctype default_enctype_list[] = { ENCTYPE_AES256_CTS_HMAC_SHA1_96, ENCTYPE_AES128_CTS_HMAC_SHA1_96, ENCTYPE_DES3_CBC_SHA1, ENCTYPE_ARCFOUR_HMAC, + ENCTYPE_CAMELLIA128_CTS_CMAC, ENCTYPE_CAMELLIA256_CTS_CMAC, ENCTYPE_DES_CBC_CRC, ENCTYPE_DES_CBC_MD5, ENCTYPE_DES_CBC_MD4, 0 }; |