Fix hefty1 hashing

lucasjones · lucasjones · commit 1fe489fb3edf · 2014-04-20T16:39:53.000+01:00
diff --git a/hefty1.c b/hefty1.c
@@ -51,10 +51,12 @@ void hefty1_hash(const char* input, char* output, uint32_t len)
     uint32_t i;
     uint32_t j;
     
+    #define OUTPUT_BIT (i * 4 + j)
+    
     for(i = 0; i < 64; i++) {
         for(j = 0; j < 4; j++) {
-            if((*(hash[j] + i) & 0x80) != 0)
-                output[((i * 4 + j) - (i * 4 + j) % 8) / 8] |= 1 << (i * 4 + j) % 8;
+            if((*(hash[j] + (i / 8)) & (0x80 >> (i % 8))) != 0)
+                *(output + (OUTPUT_BIT / 8)) |= 0x80 >> (OUTPUT_BIT % 8);
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,12 @@ void hefty1_hash(const char* input, char* output, uint32_t len)`
`51`	`51`	`uint32_t i;`
`52`	`52`	`uint32_t j;`
`53`	`53`
	`54`	`+ #define OUTPUT_BIT (i * 4 + j)`
	`55`	`+`
`54`	`56`	`for(i = 0; i < 64; i++) {`
`55`	`57`	`for(j = 0; j < 4; j++) {`
`56`		`- if((*(hash[j] + i) & 0x80) != 0)`
`57`		`- output[((i * 4 + j) - (i * 4 + j) % 8) / 8] \|= 1 << (i * 4 + j) % 8;`
	`58`	`+ if((*(hash[j] + (i / 8)) & (0x80 >> (i % 8))) != 0)`
	`59`	`+ *(output + (OUTPUT_BIT / 8)) \|= 0x80 >> (OUTPUT_BIT % 8);`
`58`	`60`	`}`
`59`	`61`	`}`
`60`	`62`