X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fm_md5.h;h=ea61c8231cf9fcd0405a16f246f4f312e8910148;hb=40fe452223b5cc0ff5dbae0efa8551d7e96c1a5c;hp=5243c51be2b6c058ea13f9e6b0cc6eda4a74c0b1;hpb=82d02e1f39249cce1362c0a41c4fe2a7005ae835;p=~andy%2Ffetchmail

diff --git a/fm_md5.h b/fm_md5.h
index 5243c51b..ea61c823 100644
--- a/fm_md5.h
+++ b/fm_md5.h
@@ -3,39 +3,27 @@
 
 #include "config.h"
 
-#include <sys/types.h>
+#include <stdint.h>
 
-#ifdef HAVE_MD5_H
-#include <md5.h>
-#else
 #include "fetchmail.h"
-#ifndef HEADER_MD5_H
-/* Try to avoid clashes with OpenSSL */
-#define HEADER_MD5_H 
-#endif
-
-
-#if SIZEOF_INT == 4
-typedef unsigned int uint32;
-#else
-typedef unsigned long int uint32;
-#endif
 
 struct MD5Context {
-	uint32 buf[4];
-	uint32 bits[2];
-	unsigned char in[64];
+	uint32_t buf[4];
+	uint32_t bits[2];
+	union {
+	    unsigned char in[64];
+	    uint32	  in32[16];
+	} u;
 };
 
 void MD5Init(struct MD5Context *context);
 void MD5Update(struct MD5Context *context, const void *buf, unsigned len);
 void MD5Final(void *digest, struct MD5Context *context);
-void MD5Transform(uint32 buf[], uint32 const in[]);
+void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
 
 /*
  * This is needed to make RSAREF happy on some MS-DOS compilers.
  */
 typedef struct MD5Context MD5_CTX;
 
-#endif
 #endif /* !MD5_H */