tornado-packages/ethers.js
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed secret storage for bad passwords.

Browse Source
This commit is contained in:
ricmoo 2017-05-29 23:08:47 -05:00
parent 33ca1fc670
commit 1b3b117b06
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wallet/secret-storage.js
View File

@ -143,7 +143,7 @@ utils.defineProperty(secretStorage, 'decrypt', function(json, password, progress
return utils.keccak256(utils.concat([derivedHalf, ciphertext]));
}
var getSigningKey = function(key) {
var getSigningKey = function(key, reject) {
var ciphertext = arrayify(searchPath(data, 'crypto/ciphertext'));
var computedMAC = utils.hexlify(computeMAC(key.slice(16, 32), ciphertext)).substring(2);
@ -202,7 +202,7 @@ utils.defineProperty(secretStorage, 'decrypt', function(json, password, progress
} else if (key) {
key = arrayify(key);
var signingKey = getSigningKey(key);
var signingKey = getSigningKey(key, reject);
if (!signingKey) { return; }
if (progressCallback) { progressCallback(1); }
@ -237,7 +237,7 @@ utils.defineProperty(secretStorage, 'decrypt', function(json, password, progress
var key = pbkdf2(password, salt, c, dkLen, prfFunc);
var signingKey = getSigningKey(key);
var signingKey = getSigningKey(key, reject);
if (!signingKey) { return; }
resolve(signingKey);