Credit John Beck's fixes.

[~andy/fetchmail] / fm_md5.h

diff --git a/fm_md5.h b/fm_md5.h
index 95bb4eddf4d5c6e2821d83494f5c1fbcfde16b64..f55909a403d9e8b5a5991550e923900633cdbe61 100644 (file)
--- a/fm_md5.h
+++ b/fm_md5.h
@@ -5,15 +5,7 @@
 
 #include <sys/types.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;
@@ -24,7 +16,10 @@ typedef unsigned long int uint32;
 struct MD5Context {
        uint32 buf[4];
        uint32 bits[2];
-       unsigned char in[64];
+       union {
+           unsigned char in[64];
+           uint32        in32[16];
+       } u;
 };
 
 void MD5Init(struct MD5Context *context);
@@ -37,5 +32,4 @@ void MD5Transform(uint32 buf[4], uint32 const in[16]);
  */
 typedef struct MD5Context MD5_CTX;
 
-#endif
 #endif /* !MD5_H */