Remove stuff

paulmillr · paulmillr · commit d34ee31b6b07 · 2022-09-08T17:28:56.000+02:00
diff --git a/src/index.ts b/src/index.ts
@@ -399,7 +399,6 @@ export default class Wallet {
       Buffer.from(json.Crypto.IV, 'hex'),
       'aes-128-cbc'
     )
-    // const seed = runCipherBuffer(decipher, ciphertext)
     return new Wallet(Buffer.from(seed))
   }
 
@@ -473,7 +472,7 @@ export default class Wallet {
   ): Promise<Wallet> {
     const json: EthSaleKeystore = typeof input === 'object' ? input : JSON.parse(input)
 
-    const encseed = Buffer.from(json.encseed, 'hex')
+    const encseed = Uint8Array.from(Buffer.from(json.encseed, 'hex'))
 
     // key derivation
     const pass = Buffer.from(password, 'utf8')
@@ -489,9 +488,8 @@ export default class Wallet {
       'aes-128-cbc',
       true
     )
-    // const seed = runCipherBuffer(decipher, encseed.slice(16))
 
-    const wallet = new Wallet(Buffer.from(keccak256(Buffer.from(seed))))
+    const wallet = new Wallet(Buffer.from(keccak256(seed)))
     if (wallet.getAddress().toString('hex') !== json.ethaddr) {
       throw new Error('Decoded key mismatch - possibly wrong passphrase')
     }
diff --git a/src/thirdparty.ts b/src/thirdparty.ts
@@ -73,18 +73,18 @@ function evp_kdf(data: Buffer, salt: Buffer, opts?: Partial<EvpKdfOpts>) {
   const tmp = Buffer.concat(ret)
 
   return {
-    key: tmp.slice(0, params.keysize),
-    iv: tmp.slice(params.keysize, params.keysize + params.ivsize),
+    key: tmp.subarray(0, params.keysize),
+    iv: tmp.subarray(params.keysize, params.keysize + params.ivsize),
   }
 }
 
 // http://stackoverflow.com/questions/25288311/cryptojs-aes-pattern-always-ends-with
 function decodeCryptojsSalt(input: string): { ciphertext: Buffer; salt?: Buffer } {
   const ciphertext = Buffer.from(input, 'base64')
-  if (ciphertext.slice(0, 8).toString() === 'Salted__') {
+  if (ciphertext.subarray(0, 8).toString() === 'Salted__') {
     return {
-      salt: ciphertext.slice(8, 16),
-      ciphertext: ciphertext.slice(16),
+      salt: ciphertext.subarray(8, 16),
+      ciphertext: ciphertext.subarray(16),
     }
   }
   return { ciphertext }
@@ -148,7 +148,6 @@ export async function fromEtherWallet(
     const evp = evp_kdf(Buffer.from(password), cipher.salt, { keysize: 32, ivsize: 16 })
 
     const pr = await decrypt(Buffer.from(cipher.ciphertext), evp.key, evp.iv, 'aes-256-cbc')
-    // privateKey = runCipherBuffer(decipher, )
 
     // NOTE: yes, they've run it through UTF8
     privateKey = Buffer.from(bytesToUtf8(pr), 'hex')

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,6 @@ export default class Wallet {`
`399`	`399`	`Buffer.from(json.Crypto.IV, 'hex'),`
`400`	`400`	`'aes-128-cbc'`
`401`	`401`	`)`
`402`		`- // const seed = runCipherBuffer(decipher, ciphertext)`
`403`	`402`	`return new Wallet(Buffer.from(seed))`
`404`	`403`	`}`
`405`	`404`
`@@ -473,7 +472,7 @@ export default class Wallet {`
`473`	`472`	`): Promise<Wallet> {`
`474`	`473`	`const json: EthSaleKeystore = typeof input === 'object' ? input : JSON.parse(input)`
`475`	`474`
`476`		`- const encseed = Buffer.from(json.encseed, 'hex')`
	`475`	`+ const encseed = Uint8Array.from(Buffer.from(json.encseed, 'hex'))`
`477`	`476`
`478`	`477`	`// key derivation`
`479`	`478`	`const pass = Buffer.from(password, 'utf8')`
`@@ -489,9 +488,8 @@ export default class Wallet {`
`489`	`488`	`'aes-128-cbc',`
`490`	`489`	`true`
`491`	`490`	`)`
`492`		`- // const seed = runCipherBuffer(decipher, encseed.slice(16))`
`493`	`491`
`494`		`- const wallet = new Wallet(Buffer.from(keccak256(Buffer.from(seed))))`
	`492`	`+ const wallet = new Wallet(Buffer.from(keccak256(seed)))`
`495`	`493`	`if (wallet.getAddress().toString('hex') !== json.ethaddr) {`
`496`	`494`	`throw new Error('Decoded key mismatch - possibly wrong passphrase')`
`497`	`495`	`}`