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

mnemonic: use a binary search for word indexes.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-09-13 20:06:53 -07:00
parent 6dbbee19d6
commit 8daddcc458
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/crypto/crypto.js
View File

@ -11,6 +11,7 @@ var assert = require('assert');
var random = require('./random'); var random = require('./random');
var scrypt = require('./scrypt'); var scrypt = require('./scrypt');
var scryptAsync = require('./scrypt-async'); var scryptAsync = require('./scrypt-async');
var utils = require('../utils/utils');
var native = require('../utils/native'); var native = require('../utils/native');
var nativeCrypto, supersha, hash, aes; var nativeCrypto, supersha, hash, aes;
@ -226,7 +227,7 @@ crypto.scrypt = function _scrypt(passwd, salt, N, r, p, len) {
* @param {Function} callback * @param {Function} callback
*/ */
crypto.scryptAsync = function _scryptAsync(passwd, salt, N, r, p, len, callback) { crypto.scryptAsync = function _scrypt(passwd, salt, N, r, p, len, callback) {
if (typeof passwd === 'string') if (typeof passwd === 'string')
passwd = new Buffer(passwd, 'utf8'); passwd = new Buffer(passwd, 'utf8');
@ -504,7 +505,7 @@ crypto.buildMerkleTree = function buildMerkleTree(leaves) {
right = tree[j + i2]; right = tree[j + i2];
if (i2 === i + 1 && i2 + 1 === size if (i2 === i + 1 && i2 + 1 === size
&& left.compare(right) === 0) { && utils.cmp(left, right) === 0) {
return; return;
} }

2
lib/hd/mnemonic.js
View File

@ -261,7 +261,7 @@ Mnemonic.prototype.fromPhrase = function fromPhrase(phrase) {
for (i = 0; i < words.length; i++) { for (i = 0; i < words.length; i++) {
word = words[i]; word = words[i];
index = wordlist.indexOf(word); index = utils.binarySearch(wordlist, word, utils.strcmp);
if (index === -1) if (index === -1)
throw new Error('Could not find word.'); throw new Error('Could not find word.');

27
lib/utils/utils.js
View File

@ -1567,19 +1567,15 @@ utils.isZero = function isZero(data) {
}; };
/** /**
* Buffer comparator (memcmp + length comparison). * String comparator (memcmp + length comparison).
* @param {Buffer} a * @param {Buffer} a
* @param {Buffer} b * @param {Buffer} b
* @returns {Number} -1, 1, or 0. * @returns {Number} -1, 1, or 0.
*/ */
utils.cmp = function cmp(a, b) { utils.strcmp = function strcmp(a, b) {
var len, i; var len = Math.min(a.length, b.length);
var i;
if (a.compare)
return a.compare(b);
len = Math.min(a.length, b.length);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (a[i] < b[i]) if (a[i] < b[i])
@ -1597,6 +1593,21 @@ utils.cmp = function cmp(a, b) {
return 0; return 0;
}; };
/**
* Buffer comparator (memcmp + length comparison).
* @param {Buffer} a
* @param {Buffer} b
* @returns {Number} -1, 1, or 0.
*/
utils.cmp = function cmp(a, b) {
return a.compare(b);
};
// Warning: polymorphism.
if (!Buffer.prototype.compare)
utils.cmp = utils.strcmp;
/** /**
* Memcmp for comparing a needle to a haystack. * Memcmp for comparing a needle to a haystack.
* @param {Buffer} target - Haystack. * @param {Buffer} target - Haystack.