diff options
| author | Sam Hartman <hartmans@mit.edu> | 2001-10-23 21:15:04 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2001-10-23 21:15:04 +0000 |
| commit | c4b08a05ed58dea774885a9ac4c241e63f056a46 (patch) | |
| tree | f5885a7788ee929f9813f8dc06b2cda186d4f882 /src/include | |
| parent | 50cdd921df6627b5403d197ecbe42572e1d096c1 (diff) | |
* Tie in Microsoft rc4 cipher and make it build
* Add hmac-md5-rc4 keyed hash and appropriate glue
* Give keyed hash verify function access to usage argument
* Add simplistic crypto system test to make check
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13832 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/k5-int.h | 1 | ||||
| -rw-r--r-- | src/include/krb5.hin | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 6aef81d0b9..f50cb595cb 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +2001-10-23 Sam Hartman <hartmans@mit.edu> + + * krb5.hin: Add rc4-hmac, rc4-hmac-exp enctypes, hmac-md5-rc4 + cksumtype + 2001-10-22 Sam Hartman <hartmans@mit.edu> * k5-int.h: keyhash_provider gains usage argument to hash function diff --git a/src/include/k5-int.h b/src/include/k5-int.h index d180e00f31..9f7a78ebae 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -556,6 +556,7 @@ struct krb5_keyhash_provider { krb5_data *output); krb5_error_code (*verify) (krb5_const krb5_keyblock *key, + krb5_keyusage usage, krb5_const krb5_data *ivec, krb5_const krb5_data *input, krb5_const krb5_data *hash, diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 710e6d6a4a..4119085a3d 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -334,6 +334,8 @@ typedef struct _krb5_enc_data { #define ENCTYPE_DES3_CBC_RAW 0x0006 /* DES-3 cbc mode raw */ #define ENCTYPE_DES_HMAC_SHA1 0x0008 #define ENCTYPE_DES3_CBC_SHA1 0x0010 +#define ENCTYPE_ARCFOUR_HMAC 0x0017 +#define ENCTYPE_ARCFOUR_HMAC_EXP 0x0018 #define ENCTYPE_UNKNOWN 0x01ff /* local crud */ /* marc's DES-3 with 32-bit length */ @@ -349,6 +351,7 @@ typedef struct _krb5_enc_data { #define CKSUMTYPE_RSA_MD5_DES 0x0008 #define CKSUMTYPE_NIST_SHA 0x0009 #define CKSUMTYPE_HMAC_SHA1_DES3 0x000c +#define CKSUMTYPE_HMAC_MD5_ARCFOUR -138 /*Microsoft md5 hmac cksumtype*/ #ifndef krb5_roundup /* round x up to nearest multiple of y */ |