diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2014-07-06 08:12:42 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2014-07-06 08:12:42 +0000 |
| commit | 047c6b726b014912dd60e865866b7de3f247a065 (patch) | |
| tree | 3bf8083bf6a1269ff6d59169f72a68e3f108b837 | |
| parent | aecd9a41ea792034aa02bdd5cef02b2eef0cce97 (diff) | |
Fixed MD5 definitions
| -rw-r--r-- | src/coucal.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/coucal.c b/src/coucal.c index 4a09328..990e3f0 100644 --- a/src/coucal.c +++ b/src/coucal.c @@ -83,11 +83,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "murmurhash3.h" #elif (defined(HTS_INTHASH_USES_MD5)) #include "md5.h" +#define HashMD5Init(CTX, FLAG) MD5Init(CTX, FLAG) +#define HashMD5Update(CTX, DATA, SIZE) MD5Update(CTX, DATA, SIZE) +#define HashMD5Final(DIGEST, CTX) MD5Final(DIGEST, CTX) #elif (defined(HTS_INTHASH_USES_OPENSSL_MD5)) #include <openssl/md5.h> -#define MD5Init(CTX, FLAG) MD5_Init(CTX) -#define MD5Update MD5_Update -#define MD5Final MD5_Final +#define HashMD5Init(CTX, FLAG) MD5_Init(CTX) +#define HashMD5Update(CTX, DATA, SIZE) MD5_Update(CTX, DATA, SIZE) +#define HashMD5Final(DIGEST, CTX) MD5_Final(DIGEST, CTX) #else #error "No hash method defined" #endif @@ -385,9 +388,9 @@ coucal_hashkeys coucal_hash_data(const void *data_, size_t size) { } u; /* compute MD5 */ - MD5Init(&ctx, 0); - MD5Update(&ctx, data, (unsigned int) size); - MD5Final(u.md5digest, &ctx); + HashMD5Init(&ctx, 0); + HashMD5Update(&ctx, data, (unsigned int) size); + HashMD5Final(u.md5digest, &ctx); #if (COUCAL_HASH_SIZE == 32) /* mix mix mix */ |