diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-10-27 06:05:13 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-10-27 06:05:13 +0000 |
| commit | 5494a07e0816d312a0ce1c5dd3482f374b68f02a (patch) | |
| tree | 3b252af1bf21242ae2bf8ed48ce0faaf4f44f241 /src | |
| parent | 2fef2710c1e3a3557647ddb291b9cb8c72aa647b (diff) | |
| download | krb5-5494a07e0816d312a0ce1c5dd3482f374b68f02a.tar.gz krb5-5494a07e0816d312a0ce1c5dd3482f374b68f02a.tar.xz krb5-5494a07e0816d312a0ce1c5dd3482f374b68f02a.zip | |
* des.h: Replace KRB_INT32 with DES_INT32 to avoid temptation to
misuse.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10251 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/kerberosIV/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/kerberosIV/des.h | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog index 62a967a4a..8fc6ac0b9 100644 --- a/src/include/kerberosIV/ChangeLog +++ b/src/include/kerberosIV/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 27 01:04:24 1997 Tom Yu <tlyu@mit.edu> + + * des.h: Replace KRB_INT32 with DES_INT32 to avoid temptation to + misuse. + Mon Oct 20 14:09:45 1997 Theodore Y. Ts'o <tytso@mit.edu> * krb.h: If we are using prototypes, add a forward declaration for diff --git a/src/include/kerberosIV/des.h b/src/include/kerberosIV/des.h index bb0275f97..9a6312eea 100644 --- a/src/include/kerberosIV/des.h +++ b/src/include/kerberosIV/des.h @@ -71,24 +71,24 @@ typedef unsigned char des_cblock[8]; /* crypto-block size */ /* Key schedule */ /* Ick. We need this in here unfortunately... */ -#ifndef KRB_INT32 +#ifndef DES_INT32 #ifdef SIZEOF_INT #if SIZEOF_INT >= 4 -#define KRB_INT32 int +#define DES_INT32 int #else -#define KRB_INT32 long +#define DES_INT32 long #endif #else /* !defined(SIZEOF_INT) */ #include <limits.h> #if (UINT_MAX >= 0xffffffff) -#define KRB_INT32 int +#define DES_INT32 int #else -#define KRB_INT32 long +#define DES_INT32 long #endif #endif /* !defined(SIZEOF_INT) */ -#endif /* !defined(KRB_INT32) */ +#endif /* !defined(DES_INT32) */ -typedef struct des_ks_struct { KRB_INT32 _[2]; } des_key_schedule[16]; +typedef struct des_ks_struct { DES_INT32 _[2]; } des_key_schedule[16]; #define DES_KEY_SZ (sizeof(des_cblock)) #define DES_ENCRYPT 1 |