diff options
author | Mark Stacey <markjstacey@gmail.com> | 2019-07-03 09:16:20 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-03 09:16:20 +0800 |
commit | 865321d26909c9927910557f4380ffb2d15d9caa (patch) | |
tree | d63eb86cbe1f19f8431ba00cd2d2788beaaaacd6 | |
parent | 687984a9383d948cbe2e8964973ee8c2f0370e6d (diff) | |
download | tangerine-wallet-browser-865321d26909c9927910557f4380ffb2d15d9caa.tar.gz tangerine-wallet-browser-865321d26909c9927910557f4380ffb2d15d9caa.tar.zst tangerine-wallet-browser-865321d26909c9927910557f4380ffb2d15d9caa.zip |
Update asmcrypto.js to latest version (#6767)
This silences a warning message that was printed to the console whenever
this module was loaded during tests.
The API changes between these two versions were reviewed carefully for
differences. The only difference made was to `PBKDF2_HMAC_SHA256.bytes`,
which was replaced by `Pbkdf2HmacSha256`.
The length argument no longer has a default value, so it has been set
to match what the default value was in the previous version we used,
which is 32 (the SHA256 hash size).
-rw-r--r-- | app/scripts/edge-encryptor.js | 4 | ||||
-rw-r--r-- | package-lock.json | 6 | ||||
-rw-r--r-- | package.json | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/app/scripts/edge-encryptor.js b/app/scripts/edge-encryptor.js index dcb06873b..cfb241ec9 100644 --- a/app/scripts/edge-encryptor.js +++ b/app/scripts/edge-encryptor.js @@ -74,8 +74,10 @@ class EdgeEncryptor { var passBuffer = Unibabel.utf8ToBuffer(password) var saltBuffer = Unibabel.base64ToBuffer(salt) + const iterations = 10000 + const length = 32 // SHA256 hash size return new Promise((resolve) => { - var key = asmcrypto.PBKDF2_HMAC_SHA256.bytes(passBuffer, saltBuffer, 10000) + var key = asmcrypto.Pbkdf2HmacSha256(passBuffer, saltBuffer, iterations, length) resolve(key) }) } diff --git a/package-lock.json b/package-lock.json index 777cf424e..eaba885fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7885,9 +7885,9 @@ "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, "asmcrypto.js": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/asmcrypto.js/-/asmcrypto.js-0.22.0.tgz", - "integrity": "sha512-usgMoyXjMbx/ZPdzTSXExhMPur2FTdz/Vo5PVx2gIaBcdAAJNOFlsdgqveM8Cff7W0v+xrf9BwjOV26JSAF9qA==" + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/asmcrypto.js/-/asmcrypto.js-2.3.2.tgz", + "integrity": "sha512-3FgFARf7RupsZETQ1nHnhLUUvpcttcCq1iZCaVAbJZbCZ5VNRrNyvpDyHTOb0KC3llFcsyOT/a99NZcCbeiEsA==" }, "asn1": { "version": "0.2.3", diff --git a/package.json b/package.json index 66965c808..491afefdb 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@sentry/browser": "^4.1.1", "@zxing/library": "^0.8.0", "abi-decoder": "^1.2.0", - "asmcrypto.js": "0.22.0", + "asmcrypto.js": "^2.3.2", "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", |