Updated keccak hashing to allow variable size, required for maxcoin and its clones.

Author: zone117x

keccak.c

@@ -4,14 +4,15 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "sha3/sph_types.h"
 #include "sha3/sph_keccak.h"
 
 
-void keccak_hash(const char* input, char* output)
+void keccak_hash(const char* input, char* output, int * size)
 {
     sph_keccak256_context ctx_keccak;
     sph_keccak256_init(&ctx_keccak);
-    sph_keccak256 (&ctx_keccak, input, 80);
+    sph_keccak256 (&ctx_keccak, input, size);//80);
     sph_keccak256_close(&ctx_keccak, output);
 }
 

keccak.h

@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-void keccak_hash(const char* input, char* output);
+void keccak_hash(const char* input, char* output, int * size);
 
 #ifdef __cplusplus
 }

multihashing.cc

@@ -13,37 +13,6 @@ extern "C" {
     #include "x11.h"
 
 
-    /*static unsigned char getNfactor(char* blockheader) {
-        int n,l = 0;
-        unsigned long nTimestamp = *(unsigned int*)(&blockheader[68]);
-        unsigned char minNfactor = 10;
-        unsigned char maxNfactor = 30;
-        unsigned char N;
-        uint64_t s;
-
-        if (nTimestamp <= 1389306217) {
-            return minNfactor;
-        }
-
-        s = nTimestamp - 1389306217;
-        while ((s >> 1) > 3) {
-          l += 1;
-          s >>= 1;
-        }
-
-        s &= 3;
-
-        n = (l * 158 + s * 28 - 2670) / 100;
-
-        if (n < 0) n = 0;
-
-        N = (unsigned char) n;
-        n = N > minNfactor ? N : minNfactor;
-        N = n < maxNfactor ? n : maxNfactor;
-
-        return N;
-    }*/
-
     #define max(a,b)            (((a) > (b)) ? (a) : (b))
     #define min(a,b)            (((a) < (b)) ? (a) : (b))
     unsigned char GetNfactorJane(int nTimestamp, int nChainStartTime, int nMin, int nMax) {
@@ -228,7 +197,9 @@ Handle<Value> keccak(const Arguments& args) {
     char * input = Buffer::Data(target);
     char * output = new char[32];
 
-    keccak_hash(input, output);
+    int* dSize = (int*)Buffer::Length(target);
+
+    keccak_hash(input, output, dSize);
 
     Buffer* buff = Buffer::New(output, 32);
     return scope.Close(buff->handle_);