From 1d3d4ada88e35f6266e10ae6c34d69f43be9dad5 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Tue, 14 Oct 1997 15:16:33 +0000
Subject: [PATCH] Fixes for code merge

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3604 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/des/md4.c | 4 ++--
 lib/des/md4.h | 8 ++++++--
 lib/des/md5.c | 6 +++---
 lib/des/md5.h | 8 ++++++--
 lib/des/sha.c | 4 ++--
 lib/des/sha.h | 8 ++++++--
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/lib/des/md4.c b/lib/des/md4.c
index 155730eb3..418ddac12 100644
--- a/lib/des/md4.c
+++ b/lib/des/md4.c
@@ -69,7 +69,7 @@ md4_init (struct md4 *m)
 }
 
 static u_int32_t
-cshift (u_int32_t x, unsigned n)
+cshift (u_int32_t x, unsigned int n)
 {
   return (x << n) | (x >> (32 - n));
 }
@@ -228,7 +228,7 @@ md4_finito (struct md4 *m, void *res)
 {
   static u_char zeros[72];
   u_int32_t len;
-  unsigned dstart = (120 - m->offset - 1) % 64 + 1;
+  unsigned int dstart = (120 - m->offset - 1) % 64 + 1;
 
   *zeros = 0x80;
   memset (zeros + 1, 0, sizeof(zeros) - 1);
diff --git a/lib/des/md4.h b/lib/des/md4.h
index db6c63595..6c9e45d93 100644
--- a/lib/des/md4.h
+++ b/lib/des/md4.h
@@ -45,11 +45,15 @@
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
+#ifdef KRB5
 #include <krb5-types.h>
+#elif defined(KRB4)
+#include <ktypes.h>
+#endif
 
 struct md4 {
-  unsigned offset;
-  unsigned sz;
+  unsigned int offset;
+  unsigned int sz;
   u_int32_t counter[4];
   unsigned char save[64];
 };
diff --git a/lib/des/md5.c b/lib/des/md5.c
index af0d80723..d3d3dac61 100644
--- a/lib/des/md5.c
+++ b/lib/des/md5.c
@@ -69,7 +69,7 @@ md5_init (struct md5 *m)
 }
 
 static inline u_int32_t
-cshift (u_int32_t x, unsigned n)
+cshift (u_int32_t x, unsigned int n)
 {
   return (x << n) | (x >> (32 - n));
 }
@@ -250,9 +250,9 @@ md5_update (struct md5 *m, const void *v, size_t len)
 void
 md5_finito (struct md5 *m, void *res)
 {
-  static u_char zeros[72];
+  static unsigned char zeros[72];
   u_int32_t len;
-  unsigned dstart = (120 - m->offset - 1) % 64 + 1;
+  unsigned int dstart = (120 - m->offset - 1) % 64 + 1;
 
   *zeros = 0x80;
   memset (zeros + 1, 0, sizeof(zeros) - 1);
diff --git a/lib/des/md5.h b/lib/des/md5.h
index 7429700b6..f1a950339 100644
--- a/lib/des/md5.h
+++ b/lib/des/md5.h
@@ -45,11 +45,15 @@
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
+#ifdef KRB5
 #include <krb5-types.h>
+#elif defined(KRB4)
+#include <ktypes.h>
+#endif
 
 struct md5 {
-  unsigned offset;
-  unsigned sz;
+  unsigned int offset;
+  unsigned int sz;
   u_int32_t counter[4];
   unsigned char save[64];
 };
diff --git a/lib/des/sha.c b/lib/des/sha.c
index 3f0871dd2..28466c365 100644
--- a/lib/des/sha.c
+++ b/lib/des/sha.c
@@ -71,7 +71,7 @@ sha_init (struct sha *m)
 }
 
 static inline u_int32_t
-cshift (u_int32_t x, unsigned n)
+cshift (u_int32_t x, unsigned int n)
 {
   return (x << n) | (x >> (32 - n));
 }
@@ -276,7 +276,7 @@ sha_finito (struct sha *m, void *res)
 {
   static unsigned char zeros[72];
   u_int32_t len;
-  unsigned dstart = (120 - m->offset - 1) % 64 + 1;
+  unsigned int dstart = (120 - m->offset - 1) % 64 + 1;
 
   *zeros = 0x80;
   memset (zeros + 1, 0, sizeof(zeros) - 1);
diff --git a/lib/des/sha.h b/lib/des/sha.h
index 1ebf71c1c..b62c67f88 100644
--- a/lib/des/sha.h
+++ b/lib/des/sha.h
@@ -45,11 +45,15 @@
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
+#ifdef KRB5
 #include <krb5-types.h>
+#elif defined(KRB4)
+#include <ktypes.h>
+#endif
 
 struct sha {
-  unsigned offset;
-  unsigned sz;
+  unsigned int offset;
+  unsigned int sz;
   u_int32_t counter[5];
   unsigned char save[64];
 };