diff options
| author | Tom Yu <tlyu@mit.edu> | 1999-08-18 23:40:48 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1999-08-18 23:40:48 +0000 |
| commit | c802d7a4222aad6fa5b5244699e8663e7b40d0ba (patch) | |
| tree | abaccd75953fb575d6f5140dc196cc770cd649e9 /src/include | |
| parent | 2d36fa93cd243ffd577e154868fcaf2522d9ed6e (diff) | |
| download | krb5-c802d7a4222aad6fa5b5244699e8663e7b40d0ba.tar.gz krb5-c802d7a4222aad6fa5b5244699e8663e7b40d0ba.tar.xz krb5-c802d7a4222aad6fa5b5244699e8663e7b40d0ba.zip | |
* krb5.hin: Re-align des3-cbc-sha1 and hmac-sha1-des3 to agree
with new number assignments; also rename symbols a little bit.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11683 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/krb5.hin | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 0bb86a453..2d00ac727 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +1999-08-18 Tom Yu <tlyu@mit.edu> + + * krb5.hin: Re-align des3-cbc-sha1 and hmac-sha1-des3 to agree + with new number assignments; also rename symbols a little bit. + 1999-08-09 Danilo Almeida <dalmeida@mit.edu> * win-mac.h: Define MAXPATHLEN only if not already defined. This diff --git a/src/include/krb5.hin b/src/include/krb5.hin index 0f4836a0b..8ec3cea6c 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -363,8 +363,8 @@ typedef struct _krb5_enc_data { /* XXX deprecated? */ #define ENCTYPE_DES3_CBC_SHA 0x0005 /* DES-3 cbc mode with NIST-SHA */ #define ENCTYPE_DES3_CBC_RAW 0x0006 /* DES-3 cbc mode raw */ -#define ENCTYPE_DES3_HMAC_SHA1 0x0007 #define ENCTYPE_DES_HMAC_SHA1 0x0008 +#define ENCTYPE_DES3_CBC_SHA1 0x0010 #define ENCTYPE_UNKNOWN 0x01ff /* local crud */ /* marc's DES-3 with 32-bit length */ @@ -379,7 +379,7 @@ typedef struct _krb5_enc_data { #define CKSUMTYPE_RSA_MD5 0x0007 #define CKSUMTYPE_RSA_MD5_DES 0x0008 #define CKSUMTYPE_NIST_SHA 0x0009 -#define CKSUMTYPE_HMAC_SHA1 0x000a +#define CKSUMTYPE_HMAC_SHA1_DES3 0x000c #ifndef krb5_roundup /* round x up to nearest multiple of y */ |
