RanchiMall/flocore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove cryptojs dependency from util

Browse Source 
...use hash.js, which is already required by elliptic
This commit is contained in:
Ryan X. Charles 2014-07-05 17:26:58 -07:00
parent 204d8563c8
commit 98bf58463e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -63,6 +63,7 @@
"commander": "~2.2.0", "commander": "~2.2.0",
"mocha": ">=1.15.1", "mocha": ">=1.15.1",
"sjcl": "=1.0.1", "sjcl": "=1.0.1",
"hash.js": "=0.3.1",
"bn.js": "=0.13.2", "bn.js": "=0.13.2",
"elliptic": "=0.15.7", "elliptic": "=0.15.7",
"bindings": "=1.1.1", "bindings": "=1.1.1",

15
util/util.js
View File

@ -4,10 +4,8 @@ var Binary = require('binary');
var Put = require('bufferput'); var Put = require('bufferput');
var buffertools = require('buffertools'); var buffertools = require('buffertools');
var sjcl = require('../lib/sjcl'); var sjcl = require('../lib/sjcl');
var browser; if (process.browser) {
var inBrowser = !process.versions; var hashjs = require('hash.js');
if (inBrowser) {
browser = require('../browser/vendor-bundle.js');
} }
var sha256 = exports.sha256 = function(data) { var sha256 = exports.sha256 = function(data) {
@ -15,7 +13,7 @@ var sha256 = exports.sha256 = function(data) {
}; };
var sha512 = exports.sha512 = function(data) { var sha512 = exports.sha512 = function(data) {
if (inBrowser) { if (process.browser) {
var datahex = data.toString('hex'); var datahex = data.toString('hex');
var databits = sjcl.codec.hex.toBits(datahex); var databits = sjcl.codec.hex.toBits(datahex);
var hashbits = sjcl.hash.sha512.hash(databits); var hashbits = sjcl.hash.sha512.hash(databits);
@ -27,7 +25,7 @@ var sha512 = exports.sha512 = function(data) {
}; };
var sha512hmac = exports.sha512hmac = function(data, key) { var sha512hmac = exports.sha512hmac = function(data, key) {
if (inBrowser) { if (process.browser) {
var skey = sjcl.codec.hex.toBits(key.toString('hex')); var skey = sjcl.codec.hex.toBits(key.toString('hex'));
var sdata = sjcl.codec.hex.toBits(data.toString('hex')); var sdata = sjcl.codec.hex.toBits(data.toString('hex'));
var hmac = new sjcl.misc.hmac(skey, sjcl.hash.sha512); var hmac = new sjcl.misc.hmac(skey, sjcl.hash.sha512);
@ -45,7 +43,9 @@ var ripe160 = exports.ripe160 = function(data) {
if (!Buffer.isBuffer(data)) { if (!Buffer.isBuffer(data)) {
throw new Error('arg should be a buffer'); throw new Error('arg should be a buffer');
} }
if (inBrowser) { if (process.browser) {
return new Buffer(hashjs.ripemd160().update(data).digest());
/*
var w = new browser.crypto31.lib.WordArray.init(Crypto.util.bytesToWords(data), data.length); var w = new browser.crypto31.lib.WordArray.init(Crypto.util.bytesToWords(data), data.length);
var wordArray = browser.crypto31.RIPEMD160(w); var wordArray = browser.crypto31.RIPEMD160(w);
var words = wordArray.words; var words = wordArray.words;
@ -54,6 +54,7 @@ var ripe160 = exports.ripe160 = function(data) {
answer.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF); answer.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
} }
return new Buffer(answer, 'hex'); return new Buffer(answer, 'hex');
*/
} }
return new Buffer(crypto.createHash('rmd160').update(data).digest('binary'), 'binary'); return new Buffer(crypto.createHash('rmd160').update(data).digest('binary'), 'binary');
}; };