HV_EXPORT hv_md5

base/hurl.cpp

@@ -35,20 +35,9 @@ static inline bool is_unambiguous(char c) {
            c == '~';
 }
 
-static char hex2i(char hex) {
-    if (hex >= '0' && hex <= '9') {
-        return hex - '0';
-    }
-    switch (hex) {
-        case 'A': case 'a': return 10;
-        case 'B': case 'b': return 11;
-        case 'C': case 'c': return 12;
-        case 'D': case 'd': return 13;
-        case 'E': case 'e': return 14;
-        case 'F': case 'f': return 15;
-        default: break;
-    }
-    return 0;
+static inline unsigned char hex2i(char hex) {
+    return hex <= '9' ? hex - '0' :
+        hex <= 'F' ? hex - 'A' + 10 : hex - 'a' + 10;
 }
 
 std::string url_escape(const char* istr) {
@@ -75,7 +64,7 @@ std::string url_unescape(const char* istr) {
         if (*p == '%' &&
             IS_HEX(p[1]) &&
             IS_HEX(p[2])) {
-            ostr += (hex2i(p[1]) << 4 | hex2i(p[2]));
+            ostr += ((hex2i(p[1]) << 4) | hex2i(p[2]));
             p += 3;
         }
         else {

unittest/md5_test.c

@@ -0,0 +1,55 @@
+/*
+ * @build: gcc -o bin/md5 unittest/md5_test.c utils/md5.c -I. -Iutils
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "md5.h"
+
+int main(int argc, char* argv[]) {
+    if (argc < 2) {
+        printf("Usage: md5 file\n");
+        printf("       md5 -s string\n");
+        return -10;
+    }
+
+    unsigned char ch = '1';
+    char md5[33];
+    hv_md5_hex(&ch, 1, md5, sizeof(md5));
+    assert(strcmp(md5, "c4ca4238a0b923820dcc509a6f75849b") == 0);
+
+    if (argc == 2) {
+        const char* filepath = argv[1];
+        FILE* fp = fopen(filepath, "r");
+        if (fp == NULL) {
+            printf("Open file '%s' failed!\n", filepath);
+            return -20;
+        }
+        fseek(fp, 0, SEEK_END);
+        long filesize = ftell(fp);
+        printf("filesize=%ld\n", filesize);
+        fseek(fp, 0, SEEK_SET);
+        unsigned char* buf = (unsigned char*)malloc(filesize);
+        size_t nread = fread(buf, 1, filesize, fp);
+        assert(nread == filesize);
+        hv_md5_hex(buf, filesize, md5, sizeof(md5));
+    }
+    else if (argc == 3) {
+        const char* flags = argv[1];
+        if (flags[0] == '-' && flags[1] == 's') {
+            hv_md5_hex((unsigned char*)argv[2], strlen(argv[2]), md5, sizeof(md5));
+        }
+        else {
+            printf("Unrecognized flags '%s'\n", flags);
+            return -40;
+        }
+    }
+
+    puts(md5);
+
+    return 0;
+}

utils/md5.c

@@ -1,310 +1,215 @@
-
-/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
+#include <string.h>
 
 #include "md5.h"
 
-/* Constants for MD5Transform routine.
- */
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-/* POINTER defines a generic pointer type */
-typedef unsigned char *POINTER;
-
-/* UINT2 defines a two byte word */
-typedef unsigned short int UINT2;
-
-/* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
-
-static void MD5Transform(UINT4 [4], unsigned char [64]);
-static void Encode(unsigned char *, UINT4 *, unsigned int);
-static void Decode(UINT4 *, unsigned char *, unsigned int);
-static void MD5_memcpy(POINTER, POINTER, unsigned int);
-static void MD5_memset(POINTER, int, unsigned int);
-
-static unsigned char PADDING[64] = {
-  0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+#define F(x,y,z) ((x & y) | (~x & z))
+#define G(x,y,z) ((x & z) | (y & ~z))
+#define H(x,y,z) (x^y^z)
+#define I(x,y,z) (y ^ (x | ~z))
+#define ROTATE_LEFT(x,n) ((x << n) | (x >> (32-n)))
+#define FF(a,b,c,d,x,s,ac) \
+    { \
+        a += F(b,c,d) + x + ac; \
+        a = ROTATE_LEFT(a,s); \
+        a += b; \
+    }
+#define GG(a,b,c,d,x,s,ac) \
+    { \
+        a += G(b,c,d) + x + ac; \
+        a = ROTATE_LEFT(a,s); \
+        a += b; \
+    }
+#define HH(a,b,c,d,x,s,ac) \
+    { \
+        a += H(b,c,d) + x + ac; \
+        a = ROTATE_LEFT(a,s); \
+        a += b; \
+    }
+#define II(a,b,c,d,x,s,ac) \
+    { \
+        a += I(b,c,d) + x + ac; \
+        a = ROTATE_LEFT(a,s); \
+        a += b; \
+    }
+
+static void MD5Transform(unsigned int state[4],unsigned char block[64]);
+static void MD5Encode(unsigned char *output,unsigned int *input,unsigned int len);
+static void MD5Decode(unsigned int *output,unsigned char *input,unsigned int len);
+
+static unsigned char PADDING[] = {
+    0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 };
 
-/* F, G, H and I are basic MD5 functions.
- */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits.
- */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-Rotation is separate from addition to prevent recomputation.
- */
-#define FF(a, b, c, d, x, s, ac) { \
- (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define GG(a, b, c, d, x, s, ac) { \
- (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define HH(a, b, c, d, x, s, ac) { \
- (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define II(a, b, c, d, x, s, ac) { \
- (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-
-/* MD5 initialization. Begins an MD5 operation, writing a new context.
- */
-void MD5Init(MD5_CTX *context)  /* context */
-{
-  context->count[0] = context->count[1] = 0;
-  /* Load magic initialization constants.*/
-  context->state[0] = 0x67452301;
-  context->state[1] = 0xefcdab89;
-  context->state[2] = 0x98badcfe;
-  context->state[3] = 0x10325476;
+void MD5Init(MD5_CTX *ctx) {
+    ctx->count[0] = 0;
+    ctx->count[1] = 0;
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xEFCDAB89;
+    ctx->state[2] = 0x98BADCFE;
+    ctx->state[3] = 0x10325476;
 }
 
-/* MD5 block update operation. Continues an MD5 message-digest
-  operation, processing another message block, and updating the
-  context.
- */
-void MD5Update(MD5_CTX *context, unsigned char *input, unsigned int inputLen)
-{
-  unsigned int i, index, partLen;
-
-  /* Compute number of bytes mod 64 */
-  index = (unsigned int)((context->count[0] >> 3) & 0x3F);
-
-  /* Update number of bits */
-  if ((context->count[0] += ((UINT4)inputLen << 3)) < ((UINT4)inputLen << 3))
-    context->count[1]++;
-  context->count[1] += ((UINT4)inputLen >> 29);
-
-  partLen = 64 - index;
-
-  /* Transform as many times as possible.*/
-  if (inputLen >= partLen) {
-    MD5_memcpy((POINTER)&context->buffer[index], (POINTER)input, partLen);
-    MD5Transform (context->state, context->buffer);
-
-    for (i = partLen; i + 63 < inputLen; i += 64)
-      MD5Transform(context->state, &input[i]);
-
-    index = 0;
-  } else
-    i = 0;
-
-  /* Buffer remaining input */
-  MD5_memcpy((POINTER)&context->buffer[index], (POINTER)&input[i],
-  inputLen-i);
+void MD5Update(MD5_CTX *ctx,unsigned char *input,unsigned int inputlen) {
+    unsigned int i = 0,index = 0,partlen = 0;
+    index = (ctx->count[0] >> 3) & 0x3F;
+    partlen = 64 - index;
+    ctx->count[0] += inputlen << 3;
+    if(ctx->count[0] < (inputlen << 3)) {
+        ctx->count[1]++;
+    }
+    ctx->count[1] += inputlen >> 29;
+
+    if(inputlen >= partlen) {
+        memcpy(&ctx->buffer[index],input,partlen);
+        MD5Transform(ctx->state,ctx->buffer);
+        for(i = partlen;i+64 <= inputlen;i+=64) {
+            MD5Transform(ctx->state,&input[i]);
+        }
+        index = 0;
+    } else {
+        i = 0;
+    }
+
+    memcpy(&ctx->buffer[index],&input[i],inputlen-i);
 }
 
-/* MD5 finalization. Ends an MD5 message-digest operation, writing the
-  the message digest and zeroizing the context.
- */
-void MD5Final (unsigned char digest[16], MD5_CTX *context)
-{
-  unsigned char bits[8];
-  unsigned int index, padLen;
-
-  /* Save number of bits */
-  Encode (bits, context->count, 8);
-
-  /* Pad out to 56 mod 64. */
-  index = (unsigned int)((context->count[0] >> 3) & 0x3f);
-  padLen = (index < 56) ? (56 - index) : (120 - index);
-  MD5Update (context, PADDING, padLen);
-
-  /* Append length (before padding) */
-  MD5Update (context, bits, 8);
-  /* Store state in digest */
-  Encode (digest, context->state, 16);
-
-  /* Zeroize sensitive information. */
-  MD5_memset ((POINTER)context, 0, sizeof (*context));
+void MD5Final(MD5_CTX *ctx,unsigned char digest[16]) {
+    unsigned int index = 0,padlen = 0;
+    unsigned char bits[8];
+    index = (ctx->count[0] >> 3) & 0x3F;
+    padlen = (index < 56)?(56-index):(120-index);
+    MD5Encode(bits,ctx->count,8);
+    MD5Update(ctx,PADDING,padlen);
+    MD5Update(ctx,bits,8);
+    MD5Encode(digest,ctx->state,16);
 }
 
-/* MD5 basic transformation. Transforms state based on block.
- */
-static void MD5Transform(UINT4 state[4], unsigned char block[64])
-{
-  UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
-  Decode (x, block, 64);
-
-  /* Round 1 */
-  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
- /* Round 2 */
-  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-  state[0] += a;
-  state[1] += b;
-  state[2] += c;
-  state[3] += d;
-
-  /* Zeroize sensitive information. */
-  MD5_memset ((POINTER)x, 0, sizeof (x));
+void MD5Encode(unsigned char *output,unsigned int *input,unsigned int len) {
+    unsigned int i = 0,j = 0;
+    while(j < len) {
+        output[j] = input[i] & 0xFF;
+        output[j+1] = (input[i] >> 8) & 0xFF;
+        output[j+2] = (input[i] >> 16) & 0xFF;
+        output[j+3] = (input[i] >> 24) & 0xFF;
+        i++;
+        j+=4;
+    }
 }
 
-/* Encodes input (UINT4) into output (unsigned char). Assumes len is
-  a multiple of 4.
- */
-static void Encode(unsigned char *output, UINT4 *input, unsigned int len)
-{
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4) {
-    output[j] = (unsigned char)(input[i] & 0xff);
-    output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
-    output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
-    output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
-  }
+void MD5Decode(unsigned int *output,unsigned char *input,unsigned int len) {
+    unsigned int i = 0,j = 0;
+    while(j < len) {
+        output[i] = (input[j]) | (input[j+1] << 8) | (input[j+2] << 16) | (input[j+3] << 24);
+        i++;
+        j+=4;
+    }
 }
 
-/* Decodes input (unsigned char) into output (UINT4). Assumes len is
-  a multiple of 4.
- */
-static void Decode(UINT4 *output, unsigned char *input, unsigned int len)
-{
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4)
-    output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
-      (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
+void MD5Transform(unsigned int state[4],unsigned char block[64]) {
+    unsigned int a = state[0];
+    unsigned int b = state[1];
+    unsigned int c = state[2];
+    unsigned int d = state[3];
+    unsigned int x[64];
+
+    MD5Decode(x,block,64);
+
+    FF(a, b, c, d, x[ 0], 7, 0xd76aa478);
+    FF(d, a, b, c, x[ 1], 12, 0xe8c7b756);
+    FF(c, d, a, b, x[ 2], 17, 0x242070db);
+    FF(b, c, d, a, x[ 3], 22, 0xc1bdceee);
+    FF(a, b, c, d, x[ 4], 7, 0xf57c0faf);
+    FF(d, a, b, c, x[ 5], 12, 0x4787c62a);
+    FF(c, d, a, b, x[ 6], 17, 0xa8304613);
+    FF(b, c, d, a, x[ 7], 22, 0xfd469501);
+    FF(a, b, c, d, x[ 8], 7, 0x698098d8);
+    FF(d, a, b, c, x[ 9], 12, 0x8b44f7af);
+    FF(c, d, a, b, x[10], 17, 0xffff5bb1);
+    FF(b, c, d, a, x[11], 22, 0x895cd7be);
+    FF(a, b, c, d, x[12], 7, 0x6b901122);
+    FF(d, a, b, c, x[13], 12, 0xfd987193);
+    FF(c, d, a, b, x[14], 17, 0xa679438e);
+    FF(b, c, d, a, x[15], 22, 0x49b40821);
+
+    GG(a, b, c, d, x[ 1], 5, 0xf61e2562);
+    GG(d, a, b, c, x[ 6], 9, 0xc040b340);
+    GG(c, d, a, b, x[11], 14, 0x265e5a51);
+    GG(b, c, d, a, x[ 0], 20, 0xe9b6c7aa);
+    GG(a, b, c, d, x[ 5], 5, 0xd62f105d);
+    GG(d, a, b, c, x[10], 9,  0x2441453);
+    GG(c, d, a, b, x[15], 14, 0xd8a1e681);
+    GG(b, c, d, a, x[ 4], 20, 0xe7d3fbc8);
+    GG(a, b, c, d, x[ 9], 5, 0x21e1cde6);
+    GG(d, a, b, c, x[14], 9, 0xc33707d6);
+    GG(c, d, a, b, x[ 3], 14, 0xf4d50d87);
+    GG(b, c, d, a, x[ 8], 20, 0x455a14ed);
+    GG(a, b, c, d, x[13], 5, 0xa9e3e905);
+    GG(d, a, b, c, x[ 2], 9, 0xfcefa3f8);
+    GG(c, d, a, b, x[ 7], 14, 0x676f02d9);
+    GG(b, c, d, a, x[12], 20, 0x8d2a4c8a);
+
+    HH(a, b, c, d, x[ 5], 4, 0xfffa3942);
+    HH(d, a, b, c, x[ 8], 11, 0x8771f681);
+    HH(c, d, a, b, x[11], 16, 0x6d9d6122);
+    HH(b, c, d, a, x[14], 23, 0xfde5380c);
+    HH(a, b, c, d, x[ 1], 4, 0xa4beea44);
+    HH(d, a, b, c, x[ 4], 11, 0x4bdecfa9);
+    HH(c, d, a, b, x[ 7], 16, 0xf6bb4b60);
+    HH(b, c, d, a, x[10], 23, 0xbebfbc70);
+    HH(a, b, c, d, x[13], 4, 0x289b7ec6);
+    HH(d, a, b, c, x[ 0], 11, 0xeaa127fa);
+    HH(c, d, a, b, x[ 3], 16, 0xd4ef3085);
+    HH(b, c, d, a, x[ 6], 23,  0x4881d05);
+    HH(a, b, c, d, x[ 9], 4, 0xd9d4d039);
+    HH(d, a, b, c, x[12], 11, 0xe6db99e5);
+    HH(c, d, a, b, x[15], 16, 0x1fa27cf8);
+    HH(b, c, d, a, x[ 2], 23, 0xc4ac5665);
+
+    II(a, b, c, d, x[ 0], 6, 0xf4292244);
+    II(d, a, b, c, x[ 7], 10, 0x432aff97);
+    II(c, d, a, b, x[14], 15, 0xab9423a7);
+    II(b, c, d, a, x[ 5], 21, 0xfc93a039);
+    II(a, b, c, d, x[12], 6, 0x655b59c3);
+    II(d, a, b, c, x[ 3], 10, 0x8f0ccc92);
+    II(c, d, a, b, x[10], 15, 0xffeff47d);
+    II(b, c, d, a, x[ 1], 21, 0x85845dd1);
+    II(a, b, c, d, x[ 8], 6, 0x6fa87e4f);
+    II(d, a, b, c, x[15], 10, 0xfe2ce6e0);
+    II(c, d, a, b, x[ 6], 15, 0xa3014314);
+    II(b, c, d, a, x[13], 21, 0x4e0811a1);
+    II(a, b, c, d, x[ 4], 6, 0xf7537e82);
+    II(d, a, b, c, x[11], 10, 0xbd3af235);
+    II(c, d, a, b, x[ 2], 15, 0x2ad7d2bb);
+    II(b, c, d, a, x[ 9], 21, 0xeb86d391);
+
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
 }
 
-/* Note: Replace "for loop" with standard memcpy if possible.
- */
-static void MD5_memcpy(POINTER output, POINTER input, unsigned int len)
-{
-  unsigned int i;
-
-  for (i = 0; i < len; i++)
- output[i] = input[i];
+void hv_md5(unsigned char* input, unsigned int inputlen, unsigned char digest[16]) {
+    MD5_CTX ctx;
+    MD5Init(&ctx);
+    MD5Update(&ctx, input, inputlen);
+    MD5Final(&ctx, digest);
 }
 
-/* Note: Replace "for loop" with standard memset if possible.
- */
-static void MD5_memset(POINTER output, int value, unsigned int len)
-{
-  unsigned int i;
+static inline char i2hex(unsigned char i) {
+    return i < 10 ? i + '0' : i - 10 + 'a';
+}
 
-  for (i = 0; i < len; i++)
-    ((char *)output)[i] = (char)value;
+void hv_md5_hex(unsigned char* input, unsigned int inputlen, char* output, unsigned int outputlen) {
+    int i;
+    unsigned char digest[16];
+    if (outputlen < 32) return;
+    hv_md5(input, inputlen, digest);
+    for (i = 0; i < 16; ++i) {
+        *output++ = i2hex(digest[i] >> 4);
+        *output++ = i2hex(digest[i] & 0x0F);
+    }
+    if (outputlen > 32) *output = '\0';
 }

utils/md5.h

@@ -1,45 +1,21 @@
-/* MD5.H - header file for MD5C.C
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-#ifndef __MD5_H__
-#define __MD5_H__
+#ifndef HV_MD5_H_
+#define HV_MD5_H_
 
 #include "hexport.h"
 
-/* MD5 context. */
 typedef struct {
-  unsigned long int state[4];   /* state (ABCD) */
-  unsigned long int count[2];   /* number of bits, modulo 2^64 (lsb first) */
-  unsigned char     buffer[64]; /* input buffer */
+    unsigned int    count[2];
+    unsigned int    state[4];
+    unsigned char   buffer[64];
 } MD5_CTX;
 
-BEGIN_EXTERN_C
+void MD5Init(MD5_CTX *ctx);
+void MD5Update(MD5_CTX *ctx, unsigned char *input, unsigned int inputlen);
+void MD5Final(MD5_CTX *ctx, unsigned char digest[16]);
 
-HV_EXPORT void MD5Init(MD5_CTX *);
-HV_EXPORT void MD5Update(MD5_CTX *, unsigned char *, unsigned int);
-HV_EXPORT void MD5Final(unsigned char [16], MD5_CTX *);
+HV_EXPORT void hv_md5(unsigned char* input, unsigned int inputlen, unsigned char digest[16]);
 
-END_EXTERN_C
+// NOTE: if outputlen > 32: output[32] = '\0'
+HV_EXPORT void hv_md5_hex(unsigned char* input, unsigned int inputlen, char* output, unsigned int outputlen);
 
-#endif // __MD5_H__
+#endif // HV_MD5_H_