Merge pull request PhearNet#4 from LucasJones/master

Add skein and blake support

Author: zone117x

README.md

@@ -21,9 +21,9 @@ So far this native Node.js addon can do the following hashing algos
 ```javascript
 var multiHashing = require('multi-hashing');
 
-var algorithms = ['quark', 'x11', 'scrypt', 'scryptn', 'scryptjane', 'keccak', 'bcrypt'];
+var algorithms = ['quark', 'x11', 'scrypt', 'scryptn', 'scryptjane', 'keccak', 'bcrypt', 'skein', 'blake'];
 
-var data = new Buffer("hash me good bro");
+var data = new Buffer("7000000001e980924e4e1109230383e66d62945ff8e749903bea4336755c00000000000051928aff1b4d72416173a8c3948159a09a73ac3bb556aa6bfbcad1a85da7f4c1d13350531e24031b939b9e2b", "hex");
 
 var hashedData = algorithms.map(function(algo){
     if (algo === 'scryptjane'){
@@ -33,7 +33,7 @@ var hashedData = algorithms.map(function(algo){
         return multiHashing[algo](data, nTime, yaCoinChainStartTime);
     }
     else{
-        return return multiHashing[algo](data);
+        return multiHashing[algo](data);
     }
 });
 
@@ -42,7 +42,7 @@ console.log(hashedData);
 //<SlowBuffer 0b de 16 ef 2d 92 e4 35 65 c6 6c d8 92 d9 66 b4 3d 65 ..... >
 
 //Another example...
-var hashedScryptData = multiHashing.scrypt(new Buffer(32));
+var hashedScryptData = multiHashing.scrypt(new Buffer(80));
 
 ```
 

binding.gyp

@@ -12,6 +12,8 @@
                 "x11.c",
                 "quark.c",
                 "bcrypt.c",
+                "groestl.c",
+                "blake.c",
                 "sha3/aes_helper.c",
                 "sha3/sph_blake.c",
                 "sha3/sph_bmw.c",

blake.c

@@ -0,0 +1,17 @@
+#include "blake.h"
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "sha3/sph_blake.h"
+
+
+void blake_hash(const char* input, char* output, unsigned int len)
+{
+    sph_blake256_context ctx_blake;
+    sph_blake256_init(&ctx_blake);
+    sph_blake256(&ctx_blake, input, len);
+    sph_blake256_close(&ctx_blake, output);
+}
+

blake.h

@@ -0,0 +1,14 @@
+#ifndef BLAKE_H
+#define BLAKE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void blake_hash(const char* input, char* output, unsigned int len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

groestl.c

@@ -0,0 +1,17 @@
+#include "groestl.h"
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "sha3/sph_groestl.h"
+
+
+void groestl_hash(const char* input, char* output, unsigned int len)
+{
+    sph_groestl256_context ctx_groestl;
+    sph_groestl256_init(&ctx_groestl);
+    sph_groestl256(&ctx_groestl, input, len);
+    sph_groestl256_close(&ctx_groestl, output);
+}
+

groestl.h

@@ -0,0 +1,14 @@
+#ifndef GROESTL_H
+#define GROESTL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void groestl_hash(const char* input, char* output, unsigned int len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

keccak.c

@@ -8,7 +8,7 @@
 #include "sha3/sph_keccak.h"
 
 
-void keccak_hash(const char* input, char* output, int * size)
+void keccak_hash(const char* input, char* output, unsigned int size)
 {
     sph_keccak256_context ctx_keccak;
     sph_keccak256_init(&ctx_keccak);

keccak.h

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

multihashing.cc

@@ -11,6 +11,8 @@ extern "C" {
     #include "scryptn.h"
     #include "skein.h"
     #include "x11.h"
+    #include "groestl.h"
+    #include "blake.h"
 
 
     #define max(a,b)            (((a) > (b)) ? (a) : (b))
@@ -75,8 +77,10 @@ Handle<Value> quark(const Arguments& args) {
 
     char * input = Buffer::Data(target);
     char * output = new char[32];
+    
+    unsigned int input_len = Buffer::Length(target);
 
-    quark_hash(input, output);
+    quark_hash(input, output, input_len);
 
     Buffer* buff = Buffer::New(output, 32);
     return scope.Close(buff->handle_);
@@ -96,7 +100,9 @@ Handle<Value> x11(const Arguments& args) {
     char * input = Buffer::Data(target);
     char * output = new char[32];
 
-    x11_hash(input, output);
+    unsigned int input_len = Buffer::Length(target);
+
+    x11_hash(input, output, input_len);
 
     Buffer* buff = Buffer::New(output, 32);
     return scope.Close(buff->handle_);
@@ -197,7 +203,7 @@ Handle<Value> keccak(const Arguments& args) {
     char * input = Buffer::Data(target);
     char * output = new char[32];
 
-    int* dSize = (int*)Buffer::Length(target);
+    unsigned int dSize = Buffer::Length(target);
 
     keccak_hash(input, output, dSize);
 
@@ -226,6 +232,73 @@ Handle<Value> bcrypt(const Arguments& args) {
     return scope.Close(buff->handle_);
 }
 
+Handle<Value> skein(const Arguments& args) {
+    HandleScope scope;
+
+    if (args.Length() < 1)
+        return except("You must provide one argument.");
+
+    Local<Object> target = args[0]->ToObject();
+
+    if(!Buffer::HasInstance(target))
+        return except("Argument should be a buffer object.");
+
+    char * input = Buffer::Data(target);
+    char * output = new char[32];
+
+    unsigned int input_len = Buffer::Length(target);
+    
+    skein_hash(input, output, input_len);
+
+    Buffer* buff = Buffer::New(output, 32);
+    return scope.Close(buff->handle_);
+}
+
+
+Handle<Value> groestl(const Arguments& args) {
+    HandleScope scope;
+
+    if (args.Length() < 1)
+        return except("You must provide one argument.");
+
+    Local<Object> target = args[0]->ToObject();
+
+    if(!Buffer::HasInstance(target))
+        return except("Argument should be a buffer object.");
+
+    char * input = Buffer::Data(target);
+    char * output = new char[32];
+    
+    unsigned int input_len = Buffer::Length(target);
+
+    groestl_hash(input, output, input_len);
+
+    Buffer* buff = Buffer::New(output, 32);
+    return scope.Close(buff->handle_);
+}
+
+
+Handle<Value> blake(const Arguments& args) {
+    HandleScope scope;
+
+    if (args.Length() < 1)
+        return except("You must provide one argument.");
+
+    Local<Object> target = args[0]->ToObject();
+
+    if(!Buffer::HasInstance(target))
+        return except("Argument should be a buffer object.");
+
+    char * input = Buffer::Data(target);
+    char * output = new char[32];
+    
+    unsigned int input_len = Buffer::Length(target);
+
+    blake_hash(input, output, input_len);
+
+    Buffer* buff = Buffer::New(output, 32);
+    return scope.Close(buff->handle_);
+}
 void init(Handle<Object> exports) {
     exports->Set(String::NewSymbol("quark"), FunctionTemplate::New(quark)->GetFunction());
     exports->Set(String::NewSymbol("x11"), FunctionTemplate::New(x11)->GetFunction());
@@ -234,6 +307,9 @@ void init(Handle<Object> exports) {
     exports->Set(String::NewSymbol("scryptjane"), FunctionTemplate::New(scryptjane)->GetFunction());
     exports->Set(String::NewSymbol("keccak"), FunctionTemplate::New(keccak)->GetFunction());
     exports->Set(String::NewSymbol("bcrypt"), FunctionTemplate::New(bcrypt)->GetFunction());
+    exports->Set(String::NewSymbol("skein"), FunctionTemplate::New(skein)->GetFunction());
+    exports->Set(String::NewSymbol("groestl"), FunctionTemplate::New(groestl)->GetFunction());
+    exports->Set(String::NewSymbol("blake"), FunctionTemplate::New(blake)->GetFunction());
 }
 
 NODE_MODULE(multihashing, init)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "multi-hashing",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "main": "multihashing",
     "author": {
         "name": "Matthew Little",
@@ -27,4 +27,4 @@
         "shavite",
         "fugue"
     ]
-}
+}