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

Do not fail on an invalid input for EtherWallet

Browse Source
This commit is contained in:
Alex Beregszaszi 2016-03-16 13:03:11 +00:00
parent 06e1c1dfb4
commit f97ad5dbe5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
thirdparty.js
View File

@ -109,6 +109,10 @@ Thirdparty.fromEtherWallet = function (input, password) {
// decode openssl ciphertext + salt encoding // decode openssl ciphertext + salt encoding
cipher = decodeCryptojsSalt(cipher) cipher = decodeCryptojsSalt(cipher)
if (!cipher.salt) {
throw new Error('Unsupported EtherWallet key format')
}
// derive key/iv using OpenSSL EVP as implemented in CryptoJS // derive key/iv using OpenSSL EVP as implemented in CryptoJS
var evp = evp_kdf(new Buffer(password), cipher.salt, { keysize: 32, ivsize: 16 }) var evp = evp_kdf(new Buffer(password), cipher.salt, { keysize: 32, ivsize: 16 })