Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix bug 14, make hashlib binary safe #21

Merged
merged 1 commit into from
Sep 16, 2011
Merged

fix bug 14, make hashlib binary safe #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 73 additions & 31 deletions hashlib.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <ev.h>
#include <eio.h>
#include <fcntl.h>
#include <node_buffer.h>

extern "C" {
#include "sha.h"
Expand Down Expand Up @@ -54,17 +55,36 @@ make_digest_ex(unsigned char *md5str, unsigned char *digest, int len)
md5str[len * 2] = '\0';
}

// extracts the data from POSition of arguments. Respects Buffers
#define get_data(POS, DATA, LENGTH) \
String::Utf8Value mdata_##POS (args[POS]->ToString()); \
Local<Object> buffer_obj_##POS; \
if (node::Buffer::HasInstance(args[POS])) { \
Local<Object> buffer_obj_##POS = args[POS]->ToObject(); \
LENGTH = node::Buffer::Length(buffer_obj_##POS); \
DATA = (unsigned char *)node::Buffer::Data(buffer_obj_##POS); \
} else { \
LENGTH = (size_t)mdata_##POS.length(); \
DATA = (unsigned char *)*mdata_##POS; \
}



Handle<Value>
sha(const Arguments& args)
{
HandleScope scope;
String::Utf8Value data(args[0]->ToString());
HandleScope scope;

size_t length;
unsigned char *data;
get_data(0, data, length);

SHA_CTX ctx;
unsigned char digest[20];
unsigned char hexdigest[40];

SHA_Init(&ctx);
SHA_Update(&ctx, (unsigned char*)*data, data.length());
SHA_Update(&ctx, data, length);
SHA_Final(digest, &ctx);

make_digest_ex(hexdigest, digest, 20);
Expand All @@ -77,13 +97,17 @@ sha1(const Arguments& args)
{
HandleScope scope;
using namespace sha1module;
String::Utf8Value data(args[0]->ToString());

size_t length;
unsigned char *data;
get_data(0, data, length);

unsigned char digest[40];
unsigned char hexdigest[40];
SHAobject *sha;
sha=new SHAobject;
sha_init(sha);
sha_update(sha, (unsigned char*) *data, data.length());
sha_update(sha, data, length);
sha_final(digest, sha);

make_digest_ex(hexdigest, digest, 20);
Expand All @@ -95,17 +119,18 @@ Handle<Value>
hmac_sha1(const Arguments& args)
{
HandleScope scope;

using namespace sha1module;
String::Utf8Value data(args[0]->ToString());
String::Utf8Value key_input(args[1]->ToString());

using namespace sha1module;

unsigned char *data, *key_input;
size_t data_length, keylen;
get_data(0, data, data_length);
get_data(1, key_input, keylen);

unsigned char digest[40];
unsigned char hexdigest[40];
unsigned int i;

const void *key = (unsigned char*) *key_input;
size_t keylen = key_input.length();
const void *key = key_input;

char ipad[64], opad[64];

Expand All @@ -115,7 +140,7 @@ hmac_sha1(const Arguments& args)
SHAobject *keyhash;
keyhash = new SHAobject;
sha_init(keyhash);
sha_update(keyhash, (unsigned char*) key, keylen);
sha_update(keyhash, key_input, keylen);
sha_final((unsigned char*) optkeybuf, keyhash);
keylen = 20;
key = optkeybuf;
Expand All @@ -136,7 +161,7 @@ hmac_sha1(const Arguments& args)
context = new SHAobject;
sha_init(context);
sha_update(context, (unsigned char*) ipad, 64);
sha_update(context, (unsigned char*)*data, data.length());
sha_update(context, data, data_length);
sha_final(digest, context);

sha_init(context);
Expand All @@ -153,15 +178,16 @@ hmac_md5(const Arguments& args)
{
HandleScope scope;

String::Utf8Value data(args[0]->ToString());
String::Utf8Value key_input(args[1]->ToString());

unsigned char *data, *key_input;
size_t data_length, keylen;
get_data(0, data, data_length);
get_data(1, key_input, keylen);

unsigned char digest[16];
unsigned char hexdigest[32];
unsigned int i;

const void *key = (unsigned char*) *key_input;
size_t keylen = key_input.length();
const void *key = (unsigned char*) key_input;

char ipad[64], opad[64];

Expand Down Expand Up @@ -193,7 +219,7 @@ hmac_md5(const Arguments& args)

MD5Init(&context);
MD5Update(&context, (unsigned char*) ipad, 64);
MD5Update(&context, (unsigned char*) *data, data.length());
MD5Update(&context, data, data_length);
MD5Final(digest, &context);

MD5Init(&context);
Expand All @@ -212,13 +238,17 @@ sha256(const Arguments& args)
{
HandleScope scope;
using namespace sha256module;
String::Utf8Value data(args[0]->ToString());

size_t length;
unsigned char *data;
get_data(0, data, length);

unsigned char digest[64];
unsigned char hexdigest[64];
SHAobject *sha;
sha=new SHAobject;
sha_init(sha);
sha_update(sha, (unsigned char*) *data, data.length());
sha_update(sha, data, length);
sha_final(digest, sha);

make_digest_ex(hexdigest, digest, 32);
Expand All @@ -231,13 +261,17 @@ sha512(const Arguments& args)
{
HandleScope scope;
using namespace sha512module;
String::Utf8Value data(args[0]->ToString());

size_t length;
unsigned char *data;
get_data(0, data, length);

unsigned char digest[128];
unsigned char hexdigest[128];
SHAobject *sha;
sha=new SHAobject;
sha512_init(sha);
sha512_update(sha, (unsigned char*) *data, data.length());
sha512_update(sha, data, length);
sha512_final(digest, sha);

make_digest_ex(hexdigest, digest, 64);
Expand All @@ -249,15 +283,18 @@ Handle<Value>
md4(const Arguments& args)
{
HandleScope scope;

String::Utf8Value data(args[0]->ToString());

size_t length;
unsigned char *data;
get_data(0, data, length);

MD4_CTX mdContext;
unsigned char digest[16];
unsigned char hexdigest[32];

/* make an hash */
MD4Init(&mdContext);
MD4Update(&mdContext, (unsigned char*)*data, data.length());
MD4Update(&mdContext, data, length);
MD4Final(digest, &mdContext);

make_digest_ex(hexdigest, digest, 16);
Expand All @@ -270,14 +307,17 @@ md5(const Arguments& args)
{
HandleScope scope;

String::Utf8Value data(args[0]->ToString());
size_t length;
unsigned char *data;
get_data(0, data, length);

MD5_CTX mdContext;
unsigned char digest[16];
unsigned char hexdigest[32];

/* make an hash */
MD5Init(&mdContext);
MD5Update(&mdContext, (unsigned char*)*data, data.length());
MD5Update(&mdContext, data, length);
MD5Final(digest, &mdContext);

make_digest_ex(hexdigest, digest, 16);
Expand All @@ -290,15 +330,17 @@ md6(const Arguments& args)
{
HandleScope scope;

String::Utf8Value data(args[0]->ToString());
size_t length;
unsigned char *data;
get_data(0, data, length);

int len(32);
if (!args[1]->IsUndefined()) {
len=args[1]->ToInteger()->Value();
}
unsigned char digest[len];
unsigned char hexdigest[len];
md6_hash(len*8, (unsigned char*) *data, data.length(), digest);
md6_hash(len*8, data, length, digest);

int half_len=len/2;
if (len%2!=0) half_len++;
Expand Down
17 changes: 17 additions & 0 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var hashlib = require("./build/default/hashlib");
var sys = require("sys");
var md5 = require("./test/md5");
var assert = require("assert");

process.chdir(__dirname);

Expand Down Expand Up @@ -41,6 +42,22 @@ if (hashlib.md5_file('./test.file')=='bc8aeda5b02f054117bd9979908787dc')
else
sys.puts('test 9 FAILS');

var COLL = [0x18, 0x00, 0x00, 0x00, 0x04, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x30, 0x00, 0x8e, 0x03, 0x00, 0x00, 0x08, 0x31, 0x00, 0x01, 0x00, 0x00];

if (hashlib.sha256(new Buffer([18, 00, 00, 00, 04, 30, 00, 10, 00, 00, 00, 10, 30, 00, 0x8d, 03, 00, 00, 08, 31, 00, 01, 00, 00])) ===
hashlib.sha256(new Buffer([18, 00, 00, 00, 04, 30, 00, 10, 00, 00, 00, 10, 30, 00, 0x8e, 03, 00, 00, 08, 31, 00, 01, 00, 00])))
sys.puts('test binary fails')
else
sys.puts('test binary pass')

if (hashlib.sha256(new Buffer(COLL)) !==
'182edb820977e12de4de8b0ff835049d9b40ae8c700a3ab2f22bd44e22d85d9c'){
sys.puts('binary buffer 1 not equal. fail')
sys.puts(hashlib.sha256(new Buffer(COLL)))
} else {
sys.puts('binary buffer 1 pass')
}

hashlib.md5_file('./test.file',function(value) {
if (value=='bc8aeda5b02f054117bd9979908787dc')
sys.puts('test 10 PASSED');
Expand Down