Skip to content
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.

Sign up for GitHub

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

Jump to bottom

convert salt to Buffer instance before encrypting #2950

Merged
merged 2 commits into from
Jul 17, 2019
Merged

convert salt to Buffer instance before encrypting #2950

merged 2 commits into from
Jul 17, 2019

Commits on Jul 16, 2019

  1. convert salt to Buffer instance before encrypting 

    Previously, if a `salt` option was supplied it would be passed to
`pbkdf2Sync`/`scrypt` as a string, but during decryption it was always
converted to a Buffer instance such that supplying a `salt` option resulted in
output that could not be decrypted.

This commit fixes the bug, and also makes encrypted output match up with the
output of other wallet libraries, e.g.  `ethers`, whenever the equivalent
encryption options are used consistently across libraries.
    @michaelsbradleyjr
    michaelsbradleyjr committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    fff0e24 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2019

  1. Merge branch '2.x' into fix/accounts-decrypt

    @nivida
    nivida committed Jul 17, 2019
    Configuration menu
    Copy the full SHA
    d326043 View commit details
    Browse the repository at this point in the history