Fix typo in README.md

Add hashing algorithms to README.md
Pass length of buffer to x11 and quark
master
Lucas Jones 2014-04-18 01:36:00 +01:00
parent ef31ae5903
commit cff0e3a334
6 changed files with 22 additions and 15 deletions

View File

@ -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));
```

View File

@ -77,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_);
@ -98,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_);
@ -240,8 +244,9 @@ Handle<Value> skein(const Arguments& args) {
return except("Argument should be a buffer object.");
char * input = Buffer::Data(target);
unsigned int input_len = Buffer::Length(target);
char * output = new char[32];
unsigned int input_len = Buffer::Length(target);
skein_hash(input, output, input_len);
@ -262,9 +267,10 @@ Handle<Value> groestl(const Arguments& args) {
return except("Argument should be a buffer object.");
char * input = Buffer::Data(target);
unsigned int input_len = Buffer::Length(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);
@ -284,9 +290,10 @@ Handle<Value> blake(const Arguments& args) {
return except("Argument should be a buffer object.");
char * input = Buffer::Data(target);
unsigned int input_len = Buffer::Length(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);

View File

@ -106,7 +106,7 @@ be32dec_vect(uint32_t *dst, const unsigned char *src, size_t len)
dst[i] = be32dec(src + i * 4);
}
void quark_hash(const char* input, char* output)
void quark_hash(const char* input, char* output, unsigned int len)
{
sph_blake512_context ctx_blake;
sph_bmw512_context ctx_bmw;
@ -124,7 +124,7 @@ void quark_hash(const char* input, char* output)
sph_blake512_init(&ctx_blake);
sph_blake512 (&ctx_blake, input, 80);
sph_blake512 (&ctx_blake, input, len);
sph_blake512_close (&ctx_blake, hashA); //0

View File

@ -1,6 +1,6 @@
#ifndef QUARK_H
#define QUARK_H
void quark_hash(const char* input, char* output);
void quark_hash(const char* input, char* output, unsigned int len);
#endif

4
x11.c
View File

@ -17,7 +17,7 @@
#include "sha3/sph_echo.h"
void x11_hash(const char* input, char* output)
void x11_hash(const char* input, char* output, unsigned int len)
{
sph_blake512_context ctx_blake;
sph_bmw512_context ctx_bmw;
@ -36,7 +36,7 @@ void x11_hash(const char* input, char* output)
uint32_t hashA[16], hashB[16];
sph_blake512_init(&ctx_blake);
sph_blake512 (&ctx_blake, input, 80);
sph_blake512 (&ctx_blake, input, len);
sph_blake512_close (&ctx_blake, hashA);
sph_bmw512_init(&ctx_bmw);

2
x11.h
View File

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