Use built-in PBKDF2 implementation for browsers (#295)

* add pbkdf2 browser implementation

* use webcrypto in pbkdf2

* rename pbkdf2 file

* use pbkdf2

* add changeset

* revert rename

* remove browser field from package.json

* use `resolve.alias` for pbkdf2 if test

* use `mode` in vite.config.ts

Co-authored-by: Felicio Mununga <felicio@users.noreply.github.com>
This commit is contained in:
Pavel 2022-07-19 17:45:29 +02:00 committed by GitHub
parent e68ea9de5a
commit 1f567e189a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 3 deletions

View File

@ -0,0 +1,5 @@
---
'@status-im/js': patch
---
use built-in crypto for pbkdf2

View File

@ -0,0 +1,33 @@
import type { pbkdf2 as pbkdf2Type } from 'ethereum-cryptography/pbkdf2'
type PBKDF2 = typeof pbkdf2Type
export const pbkdf2: PBKDF2 = async (
password: Uint8Array,
salt: Uint8Array,
iterations: number,
keylen: number
): Promise<Uint8Array> => {
const cryptoKey = await window.crypto.subtle.importKey(
'raw',
password,
{ name: 'PBKDF2' },
false,
['deriveBits']
)
const derivedKey = await window.crypto.subtle.deriveBits(
{
name: 'PBKDF2',
salt,
iterations,
hash: {
name: 'SHA-256',
},
},
cryptoKey,
keylen << 3
)
return new Uint8Array(derivedKey)
}

View File

@ -1,6 +1,7 @@
import { pbkdf2 } from 'ethereum-cryptography/pbkdf2'
import { utf8ToBytes } from 'ethereum-cryptography/utils' import { utf8ToBytes } from 'ethereum-cryptography/utils'
import { pbkdf2 } from '../crypto/pbkdf2.browser'
const AES_KEY_LENGTH = 32 // bytes const AES_KEY_LENGTH = 32 // bytes
/** /**

View File

@ -4,12 +4,26 @@ import { defineConfig } from 'vite'
import { dependencies } from './package.json' import { dependencies } from './package.json'
import type { Alias } from 'vite'
const external = [ const external = [
...Object.keys(dependencies || {}), ...Object.keys(dependencies || {}),
// ...Object.keys(peerDependencies || {}), // ...Object.keys(peerDependencies || {}),
].map(name => new RegExp(`^${name}(/.*)?`)) ].map(name => new RegExp(`^${name}(/.*)?`))
export default defineConfig(({ mode }) => { export default defineConfig(({ mode }) => {
const alias: Alias[] = []
if (mode === 'test') {
alias.push({
/**
* Note: `happy-dom` nor `jsdom` have Crypto implemented (@see https://github.com/jsdom/jsdom/issues/1612)
*/
find: /^.*\/crypto\/pbkdf2.browser$/,
replacement: 'ethereum-cryptography/pbkdf2',
})
}
return { return {
build: { build: {
target: 'es2020', target: 'es2020',
@ -24,9 +38,11 @@ export default defineConfig(({ mode }) => {
external, external,
}, },
}, },
resolve: {
alias,
},
test: { test: {
// environment: 'happy-dom', environment: 'happy-dom',
}, },
} }
}) })