* des.h: Define KRB_INT32 for the purposes of dealing with the key

 	schedule.  Also, define the key schedule more sanely.  See related
 	comments in lib/crypto/des.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10230 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index 43cb228ba8b21209c884a1895440855d982729d7..ad87af8961129c68216b228f89263ef30bf0cc0f 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct 14 15:39:28 1997  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
+
+       * des.h: Define KRB_INT32 for the purposes of dealing with the key
+       schedule.  Also, define the key schedule more sanely.  See related
+       comments in lib/crypto/des.
+
 Sat Feb 22 00:49:37 1997  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * krb.h: Do not depend on unix being defined on Unix systems;

diff --git a/src/include/kerberosIV/des.h b/src/include/kerberosIV/des.h
index 82423aa0d91b43a999370dc974d45d1de601af32..bb0275f973b1a04784426caf0d639c38126b0eb2 100644 (file)
--- a/src/include/kerberosIV/des.h
+++ b/src/include/kerberosIV/des.h
@@ -68,8 +68,27 @@
 
 
 typedef unsigned char des_cblock[8];   /* crypto-block size */
+
 /* Key schedule */
-typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16];
+/* Ick.  We need this in here unfortunately... */
+#ifndef KRB_INT32
+#ifdef SIZEOF_INT
+#if SIZEOF_INT >= 4
+#define KRB_INT32 int
+#else
+#define KRB_INT32 long
+#endif
+#else /* !defined(SIZEOF_INT) */
+#include <limits.h>
+#if (UINT_MAX >= 0xffffffff)
+#define KRB_INT32 int
+#else
+#define KRB_INT32 long
+#endif
+#endif /* !defined(SIZEOF_INT) */
+#endif /* !defined(KRB_INT32) */
+
+typedef struct des_ks_struct {  KRB_INT32 _[2]; } des_key_schedule[16];
 
 #define DES_KEY_SZ     (sizeof(des_cblock))
 #define DES_ENCRYPT    1