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/tests/dejagnu | |
parent | 52bae3736c1835b8d7ba6b2e8bda370fe58f044b (diff) | |
download | krb5-41acda8ebd3517c3d0f2184c09741cd10d061182.tar.gz krb5-41acda8ebd3517c3d0f2184c09741cd10d061182.tar.xz krb5-41acda8ebd3517c3d0f2184c09741cd10d061182.zip |
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/tests/dejagnu')
-rw-r--r-- | src/tests/dejagnu/config/default.exp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index 1ae02ea10..ac9c82ae2 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -263,29 +263,29 @@ set passes { } } -# Add to above when Camellia-CCM support becomes unconditional. +# Add to above when Camellia 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} +# {supported_enctypes=camellia256-cts:normal} +# {permitted_enctypes(kdc)=camellia256-cts} +# {permitted_enctypes(slave)=camellia256-cts} +# {permitted_enctypes(client)=camellia256-cts} +# {permitted_enctypes(server)=camellia256-cts} +# {default_tgs_enctypes(kdc)=camellia256-cts} +# {default_tgs_enctypes(slave)=camellia256-cts} +# {default_tgs_enctypes(client)=camellia256-cts} +# {default_tgs_enctypes(server)=camellia256-cts} +# {default_tkt_enctypes(kdc)=camellia256-cts} +# {default_tkt_enctypes(slave)=camellia256-cts} +# {default_tkt_enctypes(client)=camellia256-cts} +# {default_tkt_enctypes(server)=camellia256-cts} # {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} +# {master_key_type=camellia256-cts} # {dummy=[verbose -log "Camellia-256 enctype"]} # } |