Changeset 675

Timestamp:

01/30/12 22:26:32 (16 months ago)

Author:

literalka

Message:

remove md5 dependency, use sam's hash instead

Location:

trollforge/lastmeasure/server

Files:

• lmutil.h (modified) (2 diffs)
• md5.c (deleted)
• md5.h (deleted)

trollforge/lastmeasure/server/lmutil.h

@@ -11 +11 @@
 #include <time.h> /* localtime_r() */
 
-#include "md5.h"
+//#include "md5.h"
 #include "lmkeywords.h"
+
+/* Jacked from http://lol.zoy.org/blog/2011/12/20/cpp-constant-string-hash */
+/* max heartiez to sam */
+#define H1(s,i,x)   (x*65599u+(uint8_t)s[(i)<strlen(s)?strlen(s)-1-(i):strlen(s)])
+#define H4(s,i,x)   H1(s,i,H1(s,i+1,H1(s,i+2,H1(s,i+3,x))))
+#define H16(s,i,x)  H4(s,i,H4(s,i+4,H4(s,i+8,H4(s,i+12,x))))
+#define H64(s,i,x)  H16(s,i,H16(s,i+16,H16(s,i+32,H16(s,i+48,x))))
+#define H256(s,i,x) H64(s,i,H64(s,i+64,H64(s,i+128,H64(s,i+192,x))))
+
+#define HASH(s)    ((uint32_t)(H256(s,0,0)^(H256(s,0,0)>>16)))
 
 class Random
@@ -129 +139 @@
         char buffer[16];
         char iphash[37];
-        char hash[8];
+        unsigned int hash;
 
         sprintf(iphash,"%s%d",client_ip,rand()%32767);
 
-        md5((unsigned char*)iphash,8,(unsigned char*)hash);
+        hash = HASH(iphash);
 
         sprintf(buffer, "%lx", (0xffffffff - t));
-        strcat(buffer,hash);
+        strcat(buffer,(char const *)hash);
 
         return buffer;