From 140e24e9149eabe8793d439a7d386c78ecb00fab Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Tue, 7 Sep 2010 17:54:15 +0000 Subject: 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 --- src/include/k5-int.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/include') diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 4b2fdd25db..efffa3b5ee 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -2676,6 +2676,30 @@ krb5_error_code krb5int_aes_decrypt(krb5_key key, const krb5_data *ivec, krb5_crypto_iov *data, size_t num_data); +krb5_error_code +krb5int_camellia_cbc_mac(krb5_key key, const krb5_crypto_iov *data, + size_t num_data, const krb5_data *iv, + krb5_data *output); + +#if 0 +/* + * There are no IANA assignments for these enctypes or cksumtypes yet. They + * must be defined to local-use negative numbers at build time for Camellia-CCM + * support to function at the moment. If one is defined, they should all be + * defined. When IANA assignments exist, these definitions should move to the + * appropriate places in krb5.hin and all CAMELLIA_CCM conditional code should + * be made unconditional. + */ +#define ENCTYPE_CAMELLIA128_CCM_128 -XXX /* Camellia CCM mode, 128-bit key */ +#define ENCTYPE_CAMELLIA256_CCM_128 -YYY /* Camellia CCM mode, 256-bit key */ +#define CKSUMTYPE_CMAC_128_CAMELLIA128 -XXX /* CMAC, 128-bit Camellia key */ +#define CKSUMTYPE_CMAC_128_CAMELLIA256 -YYY /* CMAC, 256-bit Camellia key */ +#endif + +#ifdef ENCTYPE_CAMELLIA128_CCM_128 +#define CAMELLIA_CCM +#endif + struct _krb5_kt { /* should move into k5-int.h */ krb5_magic magic; const struct _krb5_kt_ops *ops; -- cgit