Merge pull request #135 from torusresearch/master

holgerd77 · web-flow · commit 744a79df39a3 · 2020-09-14T15:08:43.000+02:00
Fix issue with buffer concatenation while using scrypt
diff --git a/src/index.ts b/src/index.ts
@@ -430,7 +430,7 @@ export default class Wallet {
     }
 
     const ciphertext = Buffer.from(json.crypto.ciphertext, 'hex')
-    const mac = keccak256(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
+    const mac = keccak256(Buffer.concat([Buffer.from(derivedKey.slice(16, 32)), ciphertext]))
     if (mac.toString('hex') !== json.crypto.mac) {
       throw new Error('Key derivation failed - possibly wrong passphrase')
     }
@@ -599,7 +599,7 @@ export default class Wallet {
     }
 
     const ciphertext = runCipherBuffer(cipher, this.privKey)
-    const mac = keccak256(Buffer.concat([derivedKey.slice(16, 32), Buffer.from(ciphertext)]))
+    const mac = keccak256(Buffer.concat([Buffer.from(derivedKey.slice(16, 32)), Buffer.from(ciphertext)]))
 
     return {
       version: 3,

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ export default class Wallet {`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`const ciphertext = Buffer.from(json.crypto.ciphertext, 'hex')`
`433`		`- const mac = keccak256(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))`
	`433`	`+ const mac = keccak256(Buffer.concat([Buffer.from(derivedKey.slice(16, 32)), ciphertext]))`
`434`	`434`	`if (mac.toString('hex') !== json.crypto.mac) {`
`435`	`435`	`throw new Error('Key derivation failed - possibly wrong passphrase')`
`436`	`436`	`}`
`@@ -599,7 +599,7 @@ export default class Wallet {`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`const ciphertext = runCipherBuffer(cipher, this.privKey)`
`602`		`- const mac = keccak256(Buffer.concat([derivedKey.slice(16, 32), Buffer.from(ciphertext)]))`
	`602`	`+ const mac = keccak256(Buffer.concat([Buffer.from(derivedKey.slice(16, 32)), Buffer.from(ciphertext)]))`
`603`	`603`
`604`	`604`	`return {`
`605`	`605`	`version: 3,`