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/include | |
| 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/include')
| -rw-r--r-- | src/include/k5-int.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index db879663b4..446c1fa740 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -2687,23 +2687,23 @@ krb5int_camellia_cbc_mac(krb5_key key, const krb5_crypto_iov *data, #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 + * must be defined to local-use negative numbers at build time for Camellia * 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. + * appropriate places in krb5.hin and all CAMELLIA conditional code should be + * made unconditional. * * The present code is experimental and may not be compatible with the * standardized version. */ -#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 */ +#define ENCTYPE_CAMELLIA128_CTS_CMAC -XXX /* Camellia CTS mode, 128-bit key */ +#define ENCTYPE_CAMELLIA256_CTS_CMAC -YYY /* Camellia CTS mode, 256-bit key */ +#define CKSUMTYPE_CMAC_CAMELLIA128 -XXX /* CMAC, 128-bit Camellia key */ +#define CKSUMTYPE_CMAC_CAMELLIA256 -YYY /* CMAC, 256-bit Camellia key */ #endif -#ifdef ENCTYPE_CAMELLIA128_CCM_128 -#define CAMELLIA_CCM +#ifdef ENCTYPE_CAMELLIA128_CTS_CMAC +#define CAMELLIA #endif struct _krb5_kt { /* should move into k5-int.h */ |