embarklabs/ethereumjs-wallet
2
0
Fork 0
mirror of https://github.com/embarklabs/ethereumjs-wallet.git synced 2025-02-10 17:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Clarify PKCS7

Browse Source
This commit is contained in:
Alex Beregszaszi 2016-03-23 16:23:48 +00:00
parent 4f7aaca49e
commit fc5452ceb9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@ -224,8 +224,6 @@ Wallet.fromV1 = function (input, password) {
var decipher = crypto.createDecipheriv('aes-128-cbc', ethUtil.sha3(derivedKey.slice(0, 16)).slice(0, 16), new Buffer(json.Crypto.IV, 'hex')) var decipher = crypto.createDecipheriv('aes-128-cbc', ethUtil.sha3(derivedKey.slice(0, 16)).slice(0, 16), new Buffer(json.Crypto.IV, 'hex'))
var seed = decipherBuffer(decipher, ciphertext) var seed = decipherBuffer(decipher, ciphertext)
// FIXME: Remove PKCS#7 padding here?
return new Wallet(seed) return new Wallet(seed)
} }
@ -266,8 +264,6 @@ Wallet.fromV3 = function (input, password, nonStrict) {
var decipher = crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex')) var decipher = crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), new Buffer(json.crypto.cipherparams.iv, 'hex'))
var seed = decipherBuffer(decipher, ciphertext, 'hex') var seed = decipherBuffer(decipher, ciphertext, 'hex')
// FIXME: Remove PKCS#7 padding here?
return new Wallet(seed) return new Wallet(seed)
} }
@ -285,11 +281,11 @@ Wallet.fromEthSale = function (input, password) {
var derivedKey = crypto.pbkdf2Sync(password, password, 2000, 32, 'sha256').slice(0, 16) var derivedKey = crypto.pbkdf2Sync(password, password, 2000, 32, 'sha256').slice(0, 16)
// seed decoding (IV is first 16 bytes) // seed decoding (IV is first 16 bytes)
// NOTE: crypto (derived from openssl) when used with aes-*-cbc will handle PKCS#7 padding internally
// see also http://stackoverflow.com/a/31614770/4964819
var decipher = crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16)) var decipher = crypto.createDecipheriv('aes-128-cbc', derivedKey, encseed.slice(0, 16))
var seed = decipherBuffer(decipher, encseed.slice(16)) var seed = decipherBuffer(decipher, encseed.slice(16))
// FIXME: Remove PKCS#7 padding here?
var wallet = new Wallet(ethUtil.sha3(seed)) var wallet = new Wallet(ethUtil.sha3(seed))
if (wallet.getAddress().toString('hex') !== json.ethaddr) { if (wallet.getAddress().toString('hex') !== json.ethaddr) {
throw new Error('Decoded key mismatch - possibly wrong passphrase') throw new Error('Decoded key mismatch - possibly wrong passphrase')