X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fm_md5.h;h=f55909a403d9e8b5a5991550e923900633cdbe61;hb=da989f7b8294e342572ec5f27f1a6f3f2b1fe56f;hp=5243c51be2b6c058ea13f9e6b0cc6eda4a74c0b1;hpb=254464339ec2b164905be726922649ad9672bd83;p=~andy%2Ffetchmail diff --git a/fm_md5.h b/fm_md5.h index 5243c51b..f55909a4 100644 --- a/fm_md5.h +++ b/fm_md5.h @@ -5,15 +5,7 @@ #include -#ifdef HAVE_MD5_H -#include -#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,18 +16,20 @@ 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); 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 buf[4], uint32 const in[16]); /* * This is needed to make RSAREF happy on some MS-DOS compilers. */ typedef struct MD5Context MD5_CTX; -#endif #endif /* !MD5_H */