warning fixes and cleanups for 64-bit machines

[citadel.git] / citadel / md5.h

diff --git a/citadel/md5.h b/citadel/md5.h
index 401726b329292c18693e71977bae4f3394a512d7..64beb61881ae93ceb69e267fc7adb0871aef7c88 100644 (file)
--- a/citadel/md5.h
+++ b/citadel/md5.h
@@ -1,18 +1,20 @@
 #ifndef MD5_H
 #define MD5_H
 
+#include "typesize.h"
+
 struct MD5Context {
-       u_int32_t buf[4];
-       u_int32_t bits[2];
-       unsigned char in[64];
+       cit_uint32_t buf[4];
+       cit_uint32_t bits[2];
+       cit_uint32_t in[16];
 };
 
 void MD5Init(struct MD5Context *context);
 void MD5Update(struct MD5Context *context, unsigned char const *buf,
               unsigned len);
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
-void MD5Transform(u_int32_t buf[4], u_int32_t const in[16]);
-char *make_apop_string(char *realpass, char *nonce, u_char *buffer);
+void MD5Transform(cit_uint32_t buf[4], cit_uint32_t const in[16]);
+char *make_apop_string(char *realpass, char *nonce, char *buffer);
 
 /*
  * This is needed to make RSAREF happy on some MS-DOS compilers.