From: Tom Yu <tlyu@mit.edu>
Date: Mon, 27 Oct 1997 06:05:13 +0000 (+0000)
Subject: 	* des.h: Replace KRB_INT32 with DES_INT32 to avoid temptation to
X-Git-Tag: krb5-1.1-beta1~974
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5494a07e0816d312a0ce1c5dd3482f374b68f02a;p=krb5.git

	* 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
---

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