Merge pull request #1494 from xchainjs/hippo/fix-xchain-crypto

Fix xchain crypto

Author: hippocampus-web3

.changeset/late-pugs-wash.md

@@ -0,0 +1,5 @@
+---
+'@xchainjs/xchain-crypto': patch
+---
+
+Fix break compatibility

packages/xchain-crypto/__tests__/crypto.test.ts

@@ -1,5 +1,6 @@
 import { decryptFromKeystore, encryptToKeyStore, generatePhrase, validatePhrase } from '../src/crypto'
 import { encodeAddress } from '../src/utils'
+import crypto from 'crypto'
 
 describe('Generate Phrase', () => {
   it('Generates 12-word phrase', () => {
@@ -14,6 +15,50 @@ describe('Generate Phrase', () => {
   })
 })
 
+describe('Keystore regression test for encrypt/decrypt with internal migration', () => {
+  const phrase = 'patient use either flash couple jump castle true broccoli cancel brand mechanic'
+  const password = '1234'
+
+  const expectedKeystore = {
+    crypto: {
+      cipher: 'aes-128-ctr',
+      ciphertext:
+        'aa6838a2aded226922107d5a2322513e5dd706149831580356dec17d8ab531f873d3f173c2775f125d2b3203c498214039cfa78ac1d0ecb29c3f9be35483c1e4d0e2267bba7b36cec14172f760a91a',
+      cipherparams: { iv: 'dffdb8bbe92e9a00e173eaa20f1a3784' },
+      kdf: 'pbkdf2',
+      kdfparams: {
+        prf: 'hmac-sha256',
+        dklen: 32,
+        salt: 'ead4ad6c09f5a5586235a642fa39c95741b35283304e3fd464d942e300fe0514',
+        c: 262144,
+      },
+      mac: '10597fd811d910c2a9ae3aa4538d03e7ddda672070c1e324603ecf6bcb0426dd',
+    },
+    id: '9ad9ea91-22ad-46a7-9613-4f9d190e32ab',
+    version: 1,
+    meta: 'xchain-keystore',
+  }
+
+  it('encryptToKeyStore() should produce expected ciphertext and mac', async () => {
+    jest
+      .spyOn(crypto, 'randomBytes')
+      .mockImplementationOnce(() => Buffer.from(expectedKeystore.crypto.kdfparams.salt, 'hex')) // salt
+      .mockImplementationOnce(() => Buffer.from(expectedKeystore.crypto.cipherparams.iv, 'hex')) // iv
+
+    const keystore = await encryptToKeyStore(phrase, password)
+
+    expect(keystore.crypto.ciphertext).toBe(expectedKeystore.crypto.ciphertext)
+    expect(keystore.crypto.mac).toBe(expectedKeystore.crypto.mac)
+    expect(keystore.crypto.kdfparams).toEqual(expectedKeystore.crypto.kdfparams)
+    expect(keystore.crypto.cipherparams).toEqual(expectedKeystore.crypto.cipherparams)
+  })
+
+  it('decryptFromKeystore() should return original phrase', async () => {
+    const result = await decryptFromKeystore(expectedKeystore, password)
+    expect(result).toBe(phrase)
+  })
+})
+
 describe('Validate Phrase', () => {
   it('Validates 12-word Phrase', () => {
     const phrase = generatePhrase()

packages/xchain-crypto/src/crypto.ts

@@ -1,6 +1,6 @@
 import * as bip39 from 'bip39'
 import crypto from 'crypto'
-import { blake256 } from '@noble/hashes/blake1.js'
+import { blake2b } from '@noble/hashes/blake2'
 import { v4 as uuidv4 } from 'uuid'
 
 import { pbkdf2Async } from './utils'
@@ -123,7 +123,9 @@ export const encryptToKeyStore = async (phrase: string, password: string): Promi
   const derivedKey = await pbkdf2Async(Buffer.from(password), salt, kdfParams.c, kdfParams.dklen, hashFunction)
   const cipherIV = crypto.createCipheriv(cipher, derivedKey.slice(0, 16), iv)
   const cipherText = Buffer.concat([cipherIV.update(Buffer.from(phrase, 'utf8')), cipherIV.final()])
-  const mac_bytes: Uint8Array = blake256(Buffer.concat([derivedKey.slice(16, 32), Buffer.from(cipherText)]))
+  const mac_bytes: Uint8Array = blake2b(Buffer.concat([derivedKey.slice(16, 32), Buffer.from(cipherText)]), {
+    dkLen: 32,
+  })
   const mac: string = Buffer.from(mac_bytes).toString('hex')
 
   const cryptoStruct = {
@@ -163,7 +165,7 @@ export const decryptFromKeystore = async (keystore: Keystore, password: string):
   )
 
   const ciphertext = Buffer.from(keystore.crypto.ciphertext, 'hex')
-  const mac_bytes: Uint8Array = blake256(Buffer.concat([derivedKey.slice(16, 32), ciphertext]))
+  const mac_bytes: Uint8Array = blake2b(Buffer.concat([derivedKey.slice(16, 32), ciphertext]), { dkLen: 32 })
   const mac: string = Buffer.from(mac_bytes).toString('hex')
 
   if (mac !== keystore.crypto.mac) throw new Error('Invalid password')