diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-11-20 00:31:46 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-11-20 00:31:46 +0000 |
| commit | 41acda8ebd3517c3d0f2184c09741cd10d061182 (patch) | |
| tree | dcc9695ff569763cfa96eff1c895d88d27721d12 /src/util | |
| parent | 52bae3736c1835b8d7ba6b2e8bda370fe58f044b (diff) | |
| download | krb5-41acda8ebd3517c3d0f2184c09741cd10d061182.zip krb5-41acda8ebd3517c3d0f2184c09741cd10d061182.tar.gz krb5-41acda8ebd3517c3d0f2184c09741cd10d061182.tar.bz2 | |
Implement Camellia-CTS-CMAC instead of Camellia-CCM
Replace the Camellia-CCM enctypes with Camellia-CTS-CMAC. Still not
compiled in by default since we don't have enctype assignments yet.
ticket: 6822
target_verion: 1.9
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24524 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/k5test.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/util/k5test.py b/src/util/k5test.py index 90f79d6..a710eee 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -1014,16 +1014,16 @@ _passes = [ 'supported_enctypes' : 'aes128-cts:normal', 'master_key_type' : 'aes128-cts'}}}}), - # Exercise the camellia256-ccm enctype. -# Enable when Camellia-CCM support becomes unconditional. + # Exercise the camellia256-cts enctype. +# Enable when Camellia support becomes unconditional. # ('camellia256', None, # {'all' : {'libdefaults' : { -# 'default_tgs_enctypes' : 'camellia256-ccm', -# 'default_tkt_enctypes' : 'camellia256-ccm', -# 'permitted_enctypes' : 'camellia256-ccm'}}}, +# 'default_tgs_enctypes' : 'camellia256-cts', +# 'default_tkt_enctypes' : 'camellia256-cts', +# 'permitted_enctypes' : 'camellia256-cts'}}}, # {'master' : {'realms' : {'$realm' : { -# 'supported_enctypes' : 'camellia256-ccm:normal', -# 'master_key_type' : 'camellia256-ccm'}}}}), +# 'supported_enctypes' : 'camellia256-cts:normal', +# 'master_key_type' : 'camellia256-cts'}}}}), # Test a setup with modern principal keys but an old TGT key. ('aes256.destgt', 'des-cbc-crc:normal', |