Merge branch 'legacy_63'

[~andy/fetchmail] / fm_md5.h

diff --git a/fm_md5.h b/fm_md5.h
index 6fccc526347747f00a45ef9b3ae5f400e963c8ab..8f367dc6ce3a295da605fb8c9edc00d76febe711 100644 (file)
--- 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
-
-#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
+#include "fetchmail.h"
 
 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_t      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 */