From 8efc77ba30288ec688916787dac17a05836ff2bf Mon Sep 17 00:00:00 2001 From: junderw Date: Mon, 1 Jun 2020 09:27:02 +0900 Subject: [PATCH 1/2] remove crypto API usage --- lib/hdkey.js | 6 +++++- package.json | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/hdkey.js b/lib/hdkey.js index c7dc805..dead781 100644 --- a/lib/hdkey.js +++ b/lib/hdkey.js @@ -1,6 +1,10 @@ var assert = require('assert') var Buffer = require('safe-buffer').Buffer -var crypto = require('crypto') +var crypto = { + createHash: require('create-hash'), + createHmac: require('create-hmac'), + randomBytes: require('randombytes') +} var bs58check = require('bs58check') var secp256k1 = require('secp256k1') diff --git a/package.json b/package.json index 9466ff0..fbe8cac 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,9 @@ }, "dependencies": { "bs58check": "^2.1.2", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "randombytes": "^2.1.0", "safe-buffer": "^5.1.1", "secp256k1": "^4.0.0" }, From 5631ae2b4bd59258fdced7ff55199bf713991124 Mon Sep 17 00:00:00 2001 From: junderw Date: Tue, 2 Jun 2020 07:33:15 +0900 Subject: [PATCH 2/2] Use hash.js instead of create-hash --- lib/hdkey.js | 8 +++++--- package.json | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/hdkey.js b/lib/hdkey.js index dead781..9695488 100644 --- a/lib/hdkey.js +++ b/lib/hdkey.js @@ -1,10 +1,12 @@ var assert = require('assert') var Buffer = require('safe-buffer').Buffer var crypto = { - createHash: require('create-hash'), createHmac: require('create-hmac'), randomBytes: require('randombytes') } +var Sha256 = require('hash.js/lib/hash/sha/256') +var RmdHash = require('hash.js/lib/hash/ripemd') +var Ripemd160 = RmdHash.ripemd160 var bs58check = require('bs58check') var secp256k1 = require('secp256k1') @@ -242,8 +244,8 @@ function serialize (hdkey, version, key) { } function hash160 (buf) { - var sha = crypto.createHash('sha256').update(buf).digest() - return crypto.createHash('ripemd160').update(sha).digest() + var sha = Buffer.from(new Sha256().update(buf).digest()) + return Buffer.from(new Ripemd160().update(sha).digest()) } HDKey.HARDENED_OFFSET = HARDENED_OFFSET diff --git a/package.json b/package.json index fbe8cac..8337670 100644 --- a/package.json +++ b/package.json @@ -35,8 +35,8 @@ }, "dependencies": { "bs58check": "^2.1.2", - "create-hash": "^1.2.0", "create-hmac": "^1.1.7", + "hash.js": "^1.1.7", "randombytes": "^2.1.0", "safe-buffer": "^5.1.1", "secp256k1": "^4.0.0"