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/include | |
| 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/include')
| -rw-r--r-- | src/include/k5-int.h | 22 | ||||
| -rw-r--r-- | src/include/krb5/krb5.hin | 4 |
2 files changed, 4 insertions, 22 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 14123a6485..b96d9675d8 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -2383,28 +2383,6 @@ krb5int_c_mandatory_cksumtype(krb5_context, krb5_enctype, krb5_cksumtype *); krb5_error_code krb5int_clean_hostname(krb5_context, const char *, char *, size_t); -#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 - * 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 conditional code should be - * made unconditional. - * - * The present code is experimental and may not be compatible with the - * standardized version. - */ -#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_CTS_CMAC -#define CAMELLIA -#endif - struct _krb5_kt { /* should move into k5-int.h */ krb5_magic magic; const struct _krb5_kt_ops *ops; diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin index 8c623df947..933d2b450a 100644 --- a/src/include/krb5/krb5.hin +++ b/src/include/krb5/krb5.hin @@ -440,6 +440,8 @@ typedef struct _krb5_crypto_iov { #define ENCTYPE_AES256_CTS_HMAC_SHA1_96 0x0012 /**< RFC 3962 */ #define ENCTYPE_ARCFOUR_HMAC 0x0017 #define ENCTYPE_ARCFOUR_HMAC_EXP 0x0018 +#define ENCTYPE_CAMELLIA128_CTS_CMAC 0x0019 +#define ENCTYPE_CAMELLIA256_CTS_CMAC 0x001a #define ENCTYPE_UNKNOWN 0x01ff #define CKSUMTYPE_CRC32 0x0001 @@ -456,6 +458,8 @@ typedef struct _krb5_crypto_iov { ENCTYPE_AES128_CTS_HMAC_SHA1_96 */ #define CKSUMTYPE_HMAC_SHA1_96_AES256 0x0010 /**< RFC 3962. Used with ENCTYPE_AES256_CTS_HMAC_SHA1_96 */ +#define CKSUMTYPE_CMAC_CAMELLIA128 0x0011 +#define CKSUMTYPE_CMAC_CAMELLIA256 0x0012 #define CKSUMTYPE_MD5_HMAC_ARCFOUR -137 /*Microsoft netlogon cksumtype*/ #define CKSUMTYPE_HMAC_MD5_ARCFOUR -138 /*Microsoft md5 hmac cksumtype*/ |