diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-10-09 14:27:04 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-10-09 14:27:04 -0400 |
| commit | 01f30a7f06110f54c5d69fdd7697347c102f5274 (patch) | |
| tree | d7103da14e3d895f6c2629647daa3fdde0641759 /src/tests/dejagnu | |
| parent | fd136728de5b603974e3ec21bc5856406c4e814d (diff) | |
| download | krb5-01f30a7f06110f54c5d69fdd7697347c102f5274.tar.gz krb5-01f30a7f06110f54c5d69fdd7697347c102f5274.tar.xz krb5-01f30a7f06110f54c5d69fdd7697347c102f5274.zip | |
De-conditionalize Camellia code
The Camellia enctypes and cksumtypes have received IANA assignments.
Add #defines using those assignments to krb5.h, remove the CAMELLIA
conditional, and enable testing code as appropriate.
The Camellia draft has not received an RFC number yet, so there is no
Doxygen markup for the enctype and cksumtype #defines. That can be
added once the RFC number is known.
Diffstat (limited to 'src/tests/dejagnu')
| -rw-r--r-- | src/tests/dejagnu/config/default.exp | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index 2804b5c7f9..67963c579a 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -189,6 +189,30 @@ set passes { {dummy=[verbose -log "AES enctypes"]} } { + camellia-only + mode=udp + des3_krbtgt=0 + {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-cts} + {dummy=[verbose -log "Camellia-256 enctype"]} + } + { aes-des3 mode=udp des3_krbtgt=0 @@ -263,32 +287,6 @@ set passes { } } -# Add to above when Camellia support becomes unconditional. -# { -# camellia-only -# mode=udp -# des3_krbtgt=0 -# {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-cts} -# {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. |