* f_cksum.c: Change code to match prototypes

	* f_cbc.c, f_ecb, f_parity, f_pcbc: Change des_cblock to
		mit_des_cblock and  des_key_schedule to
		mit_des_key_schedule. Also include des_int.h.

	* destest.c: Change des_cblock to mit_des_cblock and add local
		prototypes.

	* cs_entry.c: Remove prototypes for mit_des_cbc_cksum and
		mit_des_cbc_cksum. Now in des_int.h.

	* cbc_cksum.c, string2key.c:	Remove casts in call to
		mit_des_cbc_cksum

	* des_int.h: Add prototype for mit_des_cbc_verf_cksum. Change
		return code for mit_des_cbc_cksum to match source.

	* des.h: Remove unused structures and defines.

Short end - fix des_int.h to reflect reality (i.e. source code) and then
fix rest of code to agree. Also removed the use of old structures such
as des_cblock and  des_key_schedule. Instead the the newer
mit_des_cblock and mit_des_schedule are used.

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

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index a4e029a0c36057494402eeb08521226081aec3e1..b04331584df5285395f46e1a14ef5848cbb1b504 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,24 @@
+Thu Aug 24 18:08:42 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+        * f_cksum.c: Change code to match prototypes. 
+
+       * f_cbc.c, f_ecb, f_parity, f_pcbc: Change des_cblock to
+               mit_des_cblock and  des_key_schedule to
+               mit_des_key_schedule. Also include des_int.h.
+
+       * destest.c: Change des_cblock to mit_des_cblock and add local
+               prototypes. 
+
+       * cs_entry.c: Remove prototypes for mit_des_cbc_cksum and
+               mit_des_cbc_cksum. Now in des_int.h.
+
+       * cbc_cksum.c, string2key.c:    Remove casts in call to
+               mit_des_cbc_cksum 
+
+       * des_int.h: Add prototype for mit_des_cbc_verf_cksum. Change 
+               return code for mit_des_cbc_cksum to match source.
+
+       * des.h: Remove unused structures and defines.
 
 Thu Jul 27 15:18:37 EDT 1995   Paul Park       (pjpark@mit.edu)
        * des_int.h - Inline the old contents of include/krb5/mit-des.h.  This

diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c
index a5ea5ce4d97bfcc63422918e54e990bb59f71f86..6004aa382717c2c17f273504e0461c7da65f3af2 100644 (file)
--- a/src/lib/crypto/des/cbc_cksum.c
+++ b/src/lib/crypto/des/cbc_cksum.c
@@ -80,8 +80,7 @@ mit_des_cbc_checksum(in, in_length, key, key_size, cksum)
         return ENOMEM;
     }
 
-    mit_des_cbc_cksum((krb5_octet *)in, contents, in_length,
-                 schedule, (krb5_octet *)key);
+    mit_des_cbc_cksum(in, contents, in_length, schedule, key);
 
     cksum->checksum_type = CKSUMTYPE_DESCBC;
     cksum->length = sizeof(mit_des_cblock);
@@ -125,8 +124,7 @@ mit_des_cbc_verf_cksum(cksum, in, in_length, key, key_size)
         ;
     }
 
-    mit_des_cbc_cksum((krb5_octet *)in, contents, in_length,
-                 schedule, (krb5_octet *)key);
+    mit_des_cbc_cksum(in, contents, in_length, schedule, key);
 
     retval = 0;
     if (cksum->checksum_type == CKSUMTYPE_DESCBC) {

diff --git a/src/lib/crypto/des/cs_entry.c b/src/lib/crypto/des/cs_entry.c
index 91d00013de102bc846770edd4d5c173ca279e12b..c32acf1957adebbfe59ae9fc8da4f58cd8f09e0f 100644 (file)
--- a/src/lib/crypto/des/cs_entry.c
+++ b/src/lib/crypto/des/cs_entry.c
@@ -27,20 +27,6 @@
 #include "k5-int.h"
 #include "des_int.h"
 
-extern krb5_error_code mit_des_cbc_checksum PROTOTYPE ((
-                                                        krb5_pointer ,
-                                                       size_t ,
-                                                       krb5_pointer ,
-                                                       size_t ,
-                                                       krb5_checksum FAR * ));
-
-extern krb5_error_code mit_des_cbc_verf_cksum PROTOTYPE ((
-                                                         krb5_checksum FAR *,
-                                                         krb5_pointer ,
-                                                         size_t ,
-                                                         krb5_pointer ,
-                                                         size_t ));
-
 krb5_checksum_entry krb5_des_cbc_cksumtable_entry = {
     0,
     mit_des_cbc_checksum,

diff --git a/src/lib/crypto/des/des.h b/src/lib/crypto/des/des.h
index 3ada2e9dcaac61272b812852103b85c7e54688c8..6d8307ab7d152f42e62b829a2e6891887ccf63d7 100644 (file)
--- a/src/lib/crypto/des/des.h
+++ b/src/lib/crypto/des/des.h
@@ -30,14 +30,6 @@
 #define KRB_UINT32 unsigned KRB_INT32
 #endif
 
-typedef unsigned char des_cblock[8];   /* crypto-block size */
-/* Key schedule */
-typedef struct des_ks_struct { union { KRB_INT32 pad; des_cblock _;} __; } des_key_schedule[16];
-
-#define DES_KEY_SZ     (sizeof(des_cblock))
-#define DES_ENCRYPT    1
-#define DES_DECRYPT    0
-
 #ifndef NCOMPAT
 #define C_Block des_cblock
 #define Key_schedule des_key_schedule

diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index 567406b55c98057a6485f2c81db14e51626c44fb..cd242a36178b33795ac11816609142e5ed951aa0 100644 (file)
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -82,11 +82,17 @@ error(MIT_DES_KEYSIZE does not equal KRB5_MIT_DES_KEYSIZE)
 extern krb5_error_code mit_des_cbc_checksum
     PROTOTYPE((krb5_pointer, size_t,krb5_pointer,size_t, krb5_checksum FAR * ));
 
-/* cksum.c */
-extern long mit_des_cbc_cksum
+extern krb5_error_code mit_des_cbc_verf_cksum
+    PROTOTYPE ((krb5_checksum FAR *, krb5_pointer, size_t, krb5_pointer,
+                size_t ));
+
+
+/* f_cksum.c */
+extern unsigned long mit_des_cbc_cksum
     PROTOTYPE((krb5_octet FAR *, krb5_octet FAR *, long , mit_des_key_schedule ,
               krb5_octet FAR *));
-/* des.c */
+
+/* f_ecb.c */
 extern int mit_des_ecb_encrypt
     PROTOTYPE((mit_des_cblock FAR *, mit_des_cblock FAR *, mit_des_key_schedule , int ));
 

diff --git a/src/lib/crypto/des/destest.c b/src/lib/crypto/des/destest.c
index 084abc44041e3b8744a130550fe48b2895cba00e..0132fa2fe848cbebb3c7623459e9496f9794d235 100644 (file)
--- a/src/lib/crypto/des/destest.c
+++ b/src/lib/crypto/des/destest.c
@@ -35,7 +35,9 @@ extern mit_des_ecb_encrypt();
 #include <stdio.h>
 
 
-void convert();
+void convert PROTOTYPE((char *, unsigned char []));
+
+void des_cblock_print_file PROTOTYPE((mit_des_cblock, FILE *));
 
 void
 main(argc, argv)
@@ -154,6 +156,7 @@ unsigned char cblock[];
  */
 
 #include "des.h"
+#include "des_int.h"
 
 int
 mit_des_is_weak_key(key)
@@ -191,11 +194,11 @@ des_cblock_print_file(x, fp)
  */
 int
 mit_des_check_key_parity(key)
-     register des_cblock key;
+     register mit_des_cblock key;
 {
     int i;
     
-    for (i=0; i<sizeof(des_cblock); i++) {
+    for (i=0; i<sizeof(mit_des_cblock); i++) {
        if ((key[i] & 1) == parity_char(0xfe&key[i])) {
            printf("warning: bad parity key:");
            des_cblock_print_file(key, stdout); 
@@ -210,10 +213,10 @@ mit_des_check_key_parity(key)
 
 void
 mit_des_fixup_key_parity(key)
-     register des_cblock key;
+     register mit_des_cblock key;
 {
     int i;
-    for (i=0; i<sizeof(des_cblock); i++) 
+    for (i=0; i<sizeof(mit_des_cblock); i++) 
       {
        key[i] &= 0xfe;
        key[i] |= 1^parity_char(key[i]);

diff --git a/src/lib/crypto/des/f_cbc.c b/src/lib/crypto/des/f_cbc.c
index 0e4ffe41ddf496c2fba19a79fded6b45bf47ac8b..fa1c159e83109f308194d462d0d37c73b4d022b8 100644 (file)
--- a/src/lib/crypto/des/f_cbc.c
+++ b/src/lib/crypto/des/f_cbc.c
@@ -11,6 +11,7 @@
  * des_cbc_encrypt.c - an implementation of the DES cipher function in cbc mode
  */
 #include "des.h"
+#include "des_int.h"
 #include "f_tables.h"
 
 /*
@@ -38,11 +39,11 @@
 
 int
 mit_des_cbc_encrypt(in, out, length, schedule, ivec, encrypt)
-       const des_cblock *in;
-       des_cblock *out;
+       const mit_des_cblock FAR *in;
+       mit_des_cblock FAR *out;
        long length;
-       des_key_schedule schedule;
-       des_cblock ivec;
+       mit_des_key_schedule schedule;
+       mit_des_cblock ivec;
        int encrypt;
 {
        register unsigned KRB_INT32 left, right;

diff --git a/src/lib/crypto/des/f_cksum.c b/src/lib/crypto/des/f_cksum.c
index 17a5db0c23d9ef337a76f234ce11e41ad1aa6af2..a1220b1d8cabb8a5150f102a393c22d07feb4860 100644 (file)
--- a/src/lib/crypto/des/f_cksum.c
+++ b/src/lib/crypto/des/f_cksum.c
@@ -11,6 +11,7 @@
  * des_cbc_cksum.c - compute an 8 byte checksum using DES in CBC mode
  */
 #include "des.h"
+#include "des_int.h"
 #include "f_tables.h"
 
 /*
@@ -30,11 +31,11 @@
 
 unsigned long
 mit_des_cbc_cksum(in, out, length, schedule, ivec)
-       des_cblock *in;
-       des_cblock *out;
+       krb5_octet FAR *in;
+       krb5_octet FAR *out;
        long length;
-       des_key_schedule schedule;
-       des_cblock ivec;
+       mit_des_key_schedule schedule;
+       krb5_octet FAR *ivec;
 {
        register unsigned KRB_INT32 left, right;
        register unsigned KRB_INT32 temp;

diff --git a/src/lib/crypto/des/f_ecb.c b/src/lib/crypto/des/f_ecb.c
index f17073ebfcdaf98c88e16ecca3c633bc6e97899b..dda76d7cc4bc69cdedaa297030da4c0fa0cc7268 100644 (file)
--- a/src/lib/crypto/des/f_ecb.c
+++ b/src/lib/crypto/des/f_ecb.c
@@ -11,6 +11,7 @@
  * des_ecb_encrypt.c - do an encryption in ECB mode
  */
 #include "des.h"
+#include "des_int.h"
 #include "f_tables.h"
 
 /*
@@ -18,9 +19,9 @@
  */
 int
 mit_des_ecb_encrypt(in, out, schedule, encrypt)
-       des_cblock *in;
-       des_cblock *out;
-       des_key_schedule schedule;
+       mit_des_cblock *in;
+       mit_des_cblock *out;
+       mit_des_key_schedule schedule;
        int encrypt;
 {
        register unsigned KRB_INT32 left, right;

diff --git a/src/lib/crypto/des/f_parity.c b/src/lib/crypto/des/f_parity.c
index 7244482d75173aa4bda352706bdf28833d558489..5b64da48e86cfa7ef44975b567f9788c990e6355 100644 (file)
--- a/src/lib/crypto/des/f_parity.c
+++ b/src/lib/crypto/des/f_parity.c
@@ -10,6 +10,7 @@
 
 
 #include "des.h"
+#include "des_int.h"
 
 /*
  * des_fixup_key_parity: Forces odd parity per byte; parity is bits
@@ -22,10 +23,10 @@
 
 void
 mit_des_fixup_key_parity(key)
-     register des_cblock key;
+     register mit_des_cblock key;
 {
     int i;
-    for (i=0; i<sizeof(des_cblock); i++) 
+    for (i=0; i<sizeof(mit_des_cblock); i++) 
       {
        key[i] &= 0xfe;
        key[i] |= 1^parity_char(key[i]);
@@ -41,11 +42,11 @@ mit_des_fixup_key_parity(key)
  */
 int
 mit_des_check_key_parity(key)
-     register des_cblock key;
+     register mit_des_cblock key;
 {
     int i;
     
-    for (i=0; i<sizeof(des_cblock); i++) 
+    for (i=0; i<sizeof(mit_des_cblock); i++) 
       {
        if((key[i] & 1) == parity_char(0xfe&key[i])) 
          {

diff --git a/src/lib/crypto/des/f_pcbc.c b/src/lib/crypto/des/f_pcbc.c
index 8de7d1aaa14993a85b902d4a7b5e060a94fd4ed7..c69dac36014f7fae2c1ade9b2ca6c3206c7e9801 100644 (file)
--- a/src/lib/crypto/des/f_pcbc.c
+++ b/src/lib/crypto/des/f_pcbc.c
@@ -18,11 +18,11 @@
  */
 int
 mit_des_pcbc_encrypt(in, out, length, schedule, ivec, encrypt)
-       des_cblock *in;
-       des_cblock *out;
+       mit_des_cblock *in;
+       mit_des_cblock *out;
        long length;
-       des_key_schedule schedule;
-       des_cblock ivec;
+       mit_des_key_schedule schedule;
+       mit_des_cblock ivec;
        int encrypt;
 {
        register unsigned KRB_INT32 left, right;

diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c
index 7eb58affb0cddaedd97c9ff791b10f5f4ec32eef..166db5f48ea1e065e759839618678252ed77c115 100644 (file)
--- a/src/lib/crypto/des/string2key.c
+++ b/src/lib/crypto/des/string2key.c
@@ -147,7 +147,7 @@ const krb5_data FAR * salt;
 
     /* Now one-way encrypt it with the folded key */
     (void) mit_des_key_sched(key, key_sked);
-    (void) mit_des_cbc_cksum((krb5_octet *)copystr, key, length, key_sked, key);
+    (void) mit_des_cbc_cksum(copystr, key, length, key_sked, key);
     /* erase key_sked */
     memset((char *)key_sked, 0, sizeof(key_sked));