* des.h (des_cblock, des_key_schedule): Separate definitions into a block with

a comment indicating lib/crypto/des/des_int.h needs to be kept in sync.  Use
macro KRB5INT_DES_TYPES_DEFINED to avoid duplication.

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

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index 81769398d826ad8341c7018bce55263b7b1c0fec..ea23cb576968f66578dfdd74db0154f54bb7a687 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * des.h (des_cblock, des_key_schedule): Separate definitions into
+       a block with a comment indicating lib/crypto/des/des_int.h needs
+       to be kept in sync.  Use macro KRB5INT_DES_TYPES_DEFINED to avoid
+       duplication.
+
 2001-04-09  Ken Raeburn  <raeburn@mit.edu>
 
        * des.h: Include stdio.h.

diff --git a/src/include/kerberosIV/des.h b/src/include/kerberosIV/des.h
index 505d6073a0327503ffbfb82faaf0b5b30736fa46..67eca8ee601eff29b311b6f3d4c436322e8725a8 100644 (file)
--- a/src/include/kerberosIV/des.h
+++ b/src/include/kerberosIV/des.h
@@ -78,15 +78,29 @@
 #endif /* !defined(SIZEOF_INT) */
 #endif /* !defined(KRB4_32) */
 
-typedef unsigned char des_cblock[8];   /* crypto-block size */
-
 /* Key schedule */
 /* Ick.  We need this in here unfortunately... */
 #ifndef DES_INT32
 #define DES_INT32 KRB4_32
 #endif
 
+/*
+ *
+ * NOTE WELL:
+ *
+ * This section must be kept in sync with lib/crypto/des/des_int.h,
+ * until we get around to actually combining them at the source level.
+ * We can't right now, because both the Mac and Windows platforms are
+ * using their own versions of krb4 des.h, and that's the one that
+ * would have to have the definitions because we install it under UNIX.
+ *
+ */
+#ifndef KRB5INT_DES_TYPES_DEFINED
+#define KRB5INT_DES_TYPES_DEFINED
+typedef unsigned char des_cblock[8];   /* crypto-block size */
 typedef struct des_ks_struct {  DES_INT32 _[2]; } des_key_schedule[16];
+#endif
+/* end sync */
 
 #define DES_KEY_SZ     (sizeof(des_cblock))
 #define DES_ENCRYPT    1