-
Notifications
You must be signed in to change notification settings - Fork 36
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use built-in PBKDF2 implementation #295
Merged
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5fca820
add pbkdf2 browser implementation
prichodko e70ad9b
use webcrypto in pbkdf2
felicio 4fdca3b
rename pbkdf2 file
felicio 7d0865d
use pbkdf2
felicio 9a3b5d9
add changeset
felicio 2a97011
revert rename
felicio 9075907
remove browser field from package.json
felicio 50d934f
use `resolve.alias` for pbkdf2 if test
felicio eb9e865
use `mode` in vite.config.ts
felicio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@status-im/js': patch | ||
--- | ||
|
||
use built-in crypto for pbkdf2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would do it the same, but I remember reading this from their docs:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thx 👍, done.