aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib/encryptor.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-11-23 09:55:22 +0800
committerGitHub <noreply@github.com>2016-11-23 09:55:22 +0800
commitec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20 (patch)
tree5c2f426a63e22f4abc378a59bb86faba7e002877 /app/scripts/lib/encryptor.js
parent427a10308309e7d4792878ce997728a9a25cb39b (diff)
parent05c8658ff343af61b1a40a5624ecba77adb2ef00 (diff)
downloadtangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar.gz
tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.tar.zst
tangerine-wallet-browser-ec8b0148f0bf4114ab27d9bfe8ebca8a116e4b20.zip
Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptor
Fix new encryptor implementation
Diffstat (limited to 'app/scripts/lib/encryptor.js')
-rw-r--r--app/scripts/lib/encryptor.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/lib/encryptor.js b/app/scripts/lib/encryptor.js
index 8bacab766..4770d2f54 100644
--- a/app/scripts/lib/encryptor.js
+++ b/app/scripts/lib/encryptor.js
@@ -42,7 +42,6 @@ function encryptWithKey (key, dataObj) {
var data = JSON.stringify(dataObj)
var dataBuffer = convertStringToArrayBufferView(data)
var vector = global.crypto.getRandomValues(new Uint8Array(16))
-
return global.crypto.subtle.encrypt({
name: 'AES-GCM',
iv: vector,