aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorMark Stacey <markjstacey@gmail.com>2019-07-03 09:16:20 +0800
committerGitHub <noreply@github.com>2019-07-03 09:16:20 +0800
commit865321d26909c9927910557f4380ffb2d15d9caa (patch)
treed63eb86cbe1f19f8431ba00cd2d2788beaaaacd6 /app
parent687984a9383d948cbe2e8964973ee8c2f0370e6d (diff)
downloadtangerine-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).
Diffstat (limited to 'app')
-rw-r--r--app/scripts/edge-encryptor.js4
1 files changed, 3 insertions, 1 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)
})
}