Merge pull request #77 from ethereumjs/remove-excess-parameter

axic · web-flow · commit 2d1c13b89b4b · 2018-12-12T14:49:59.000Z
Remove excess parameter from decipherBuffer
diff --git a/src/index.js b/src/index.js
@@ -277,7 +277,7 @@ Wallet.fromV3 = function (input, password, nonStrict) {
   }
 
   var decipher = crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), Buffer.from(json.crypto.cipherparams.iv, 'hex'))
-  var seed = decipherBuffer(decipher, ciphertext, 'hex')
+  var seed = decipherBuffer(decipher, ciphertext)
 
   return new Wallet(seed)
 }

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ Wallet.fromV3 = function (input, password, nonStrict) {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`var decipher = crypto.createDecipheriv(json.crypto.cipher, derivedKey.slice(0, 16), Buffer.from(json.crypto.cipherparams.iv, 'hex'))`
`280`		`- var seed = decipherBuffer(decipher, ciphertext, 'hex')`
	`280`	`+ var seed = decipherBuffer(decipher, ciphertext)`
`281`	`281`
`282`	`282`	`return new Wallet(seed)`
`283`	`283`	`}`