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/tests | |
| parent | 97b6d19bc89c8eb6754225875890e0f2dbdd929d (diff) | |
| download | krb5-140e24e9149eabe8793d439a7d386c78ecb00fab.tar.gz krb5-140e24e9149eabe8793d439a7d386c78ecb00fab.tar.xz krb5-140e24e9149eabe8793d439a7d386c78ecb00fab.zip | |
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/tests')
| -rw-r--r-- | src/tests/dejagnu/config/default.exp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index f0276b59a..1ae02ea10 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -263,6 +263,32 @@ set passes { } } +# Add to above when Camellia-CCM support becomes unconditional. +# { +# camellia-only +# mode=udp +# des3_krbtgt=0 +# {supported_enctypes=camellia256-ccm:normal} +# {permitted_enctypes(kdc)=camellia256-ccm} +# {permitted_enctypes(slave)=camellia256-ccm} +# {permitted_enctypes(client)=camellia256-ccm} +# {permitted_enctypes(server)=camellia256-ccm} +# {default_tgs_enctypes(kdc)=camellia256-ccm} +# {default_tgs_enctypes(slave)=camellia256-ccm} +# {default_tgs_enctypes(client)=camellia256-ccm} +# {default_tgs_enctypes(server)=camellia256-ccm} +# {default_tkt_enctypes(kdc)=camellia256-ccm} +# {default_tkt_enctypes(slave)=camellia256-ccm} +# {default_tkt_enctypes(client)=camellia256-ccm} +# {default_tkt_enctypes(server)=camellia256-ccm} +# {allow_weak_crypto(kdc)=false} +# {allow_weak_crypto(slave)=false} +# {allow_weak_crypto(client)=false} +# {allow_weak_crypto(server)=false} +# {master_key_type=camellia256-ccm} +# {dummy=[verbose -log "Camellia-256 enctype"]} +# } + # des.md5-tgt is set as unused, since it won't trigger the error case # if SUPPORT_DESMD5 isn't honored. |