tweaks

[irc/evilnet/x3.git] / src / md5.c

diff --git a/src/md5.c b/src/md5.c
index 7b8edbc1e1437fb328fb9d74824f3b7654182483..62680ee087931793d361f69de005d8da5a2a5b2e 100644 (file)
--- a/src/md5.c
+++ b/src/md5.c
@@ -439,6 +439,7 @@ void md5_process( md5_context *ctx, uint8 data[64] )
     C = ctx->state[2];
     D = ctx->state[3];
 
+#undef F
 #define F(x,y,z) (z ^ (x & (y ^ z)))
 
     P( A, B, C, D,  0,  7, 0xD76AA478 );
@@ -611,30 +612,7 @@ void md5_finish( md5_context *ctx, uint8 digest[16] )
  * those are the standard RFC 1321 test vectors
  */
 
-static char *msg[] = 
-{
-    "",
-    "a",
-    "abc",
-    "message digest",
-    "abcdefghijklmnopqrstuvwxyz",
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-    "12345678901234567890123456789012345678901234567890123456789012" \
-        "345678901234567890"
-};
-
-static char *val[] =
-{
-    "d41d8cd98f00b204e9800998ecf8427e",
-    "0cc175b9c0f1b6a831c399e269772661",
-    "900150983cd24fb0d6963f7d28e17f72",
-    "f96b697d7cb7938d525a2f31aaf161d0",
-    "c3fcd3d76192e4007dfb496cca67e13b",
-    "d174ab98d277d9f5a5611c2c9f419d9f",
-    "57edf4a22be3c955ac49da2e2107b67a"
-};
-
-char* md5(char* pass, char* output)
+char* md5(const char* pass, char* output)
 {
     md5_context ctx;
     int j;
@@ -648,6 +626,7 @@ char* md5(char* pass, char* output)
         sprintf(output + j * 2, "%02x", md5sum[j]);
     }
     printf("The hash of %s is %s\n\n", pass, output);
+    return 0;
 }
 
 const char *