diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-09-07 17:54:15 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-09-07 17:54:15 +0000 |
| commit | 140e24e9149eabe8793d439a7d386c78ecb00fab (patch) | |
| tree | fccb86dad4bd892ba5be6660c91a6222992bdf7f /src/util | |
| parent | 97b6d19bc89c8eb6754225875890e0f2dbdd929d (diff) | |
| download | krb5-140e24e9149eabe8793d439a7d386c78ecb00fab.zip krb5-140e24e9149eabe8793d439a7d386c78ecb00fab.tar.gz krb5-140e24e9149eabe8793d439a7d386c78ecb00fab.tar.bz2 | |
Merge the camellia-ccm branch to trunk. Since there are no IANA
assignments for Camellia-CCM enctypes or cksumtypes yet, they are
disabled in a default build. They can be made available by defining
(via CPPFLAGS) local-use enctype numbers for the enctypes and
cksumtypes.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24295 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/collected-client-lib/Makefile.in | 1 | ||||
| -rw-r--r-- | src/util/k5test.py | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/util/collected-client-lib/Makefile.in b/src/util/collected-client-lib/Makefile.in index 0776b10..d11d77b 100644 --- a/src/util/collected-client-lib/Makefile.in +++ b/src/util/collected-client-lib/Makefile.in @@ -51,6 +51,7 @@ STOBJLISTS= \ ../../lib/crypto/@CRYPTO_IMPL@/sha1/OBJS.ST \ ../../lib/crypto/@CRYPTO_IMPL@/arcfour/OBJS.ST \ ../../lib/crypto/@CRYPTO_IMPL@/aes/OBJS.ST \ + ../../lib/crypto/@CRYPTO_IMPL@/camellia/OBJS.ST \ ../../lib/crypto/krb/yarrow/OBJS.ST \ ../../lib/crypto/krb/OBJS.ST \ ../../lib/crypto/@CRYPTO_IMPL@/OBJS.ST \ diff --git a/src/util/k5test.py b/src/util/k5test.py index d880862..dbac717 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -1013,6 +1013,17 @@ _passes = [ 'supported_enctypes' : 'aes128-cts:normal', 'master_key_type' : 'aes128-cts'}}}}), + # Exercise the camellia256-ccm enctype. +# Enable when Camellia-CCM support becomes unconditional. +# ('camellia256', None, +# {'all' : {'libdefaults' : { +# 'default_tgs_enctypes' : 'camellia256-ccm', +# 'default_tkt_enctypes' : 'camellia256-ccm', +# 'permitted_enctypes' : 'camellia256-ccm'}}}, +# {'master' : {'realms' : {'$realm' : { +# 'supported_enctypes' : 'camellia256-ccm:normal', +# 'master_key_type' : 'camellia256-ccm'}}}}), + # Test a setup with modern principal keys but an old TGT key. ('aes256.destgt', 'des-cbc-crc:normal', {'all' : {'libdefaults' : {'allow_weak_crypto' : 'true'}}}, |