This repository has been archived by the owner on Mar 7, 2023. It is now read-only.
Remove SJCL #388
Merged
Remove SJCL #388
Conversation
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
Sjors
approved these changes
May 30, 2017
src/wallet-crypto.js
Outdated
|
|
||
| salt = sjcl.codec.hex.toBits(salt.toString('hex')); | ||
| var stretched = sjcl.misc.pbkdf2(password, salt, iterations, keylen || 256, hmacSHA1); | ||
| assert(typeof password === 'string', 'password string required'); |
There was a problem hiding this comment.
probably not important, but the previous assert failed on empty string while the new one doesn't
There was a problem hiding this comment.
Nice, will check for that. Thanks!
src/wallet-crypto.js
Outdated
| var stretched = sjcl.misc.pbkdf2(password, salt, iterations, keylen || 256, hmacSHA1); | ||
| assert(typeof password === 'string', 'password string required'); | ||
| assert(typeof iterations === 'number' && !isNaN(iterations), 'iterations number required'); | ||
| assert(keyLenBits == null || keyLenBits % 8 === 0, 'key length must be evenly divisible into bytes'); |
There was a problem hiding this comment.
successfully fails on keyLenBits === Infinity and -Infinity :)
There was a problem hiding this comment.
untested but looks good to me. nice improvement on stricter asserts and better var naming. would be nice one day to add a unit test or two more for stretchPassword using more typical values for the wallet to ensure consistency between sjcl and crypto-browserify, but I bet all sorts of obvious stuff would break in the wallet if they weren't the same.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This removes SJCL by replacing it with the latest version of crypto-browserify's pbkdf2 implementation. It's ~1.4x slower, but that's acceptable.
I'd like to add the option to encrypt / decrypt asynchronously as well, since that will be ~10x faster than SJCL was and not block the UI. But with the async approach there's more that could potentially go wrong, so will leave that out for now.