aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-12-20 13:55:02 +0800
committerDan Finlay <dan@danfinlay.com>2016-12-20 13:55:02 +0800
commit26f1e6cbd2af9d6bb0c58871635466c459cc87d8 (patch)
tree929b446d53ae811e7105aaa7ceb6e4d18579fcd6 /app/scripts/keyring-controller.js
parentead8329877c5441f32ab389adb41689086a38608 (diff)
downloadtangerine-wallet-browser-26f1e6cbd2af9d6bb0c58871635466c459cc87d8.tar.gz
tangerine-wallet-browser-26f1e6cbd2af9d6bb0c58871635466c459cc87d8.tar.zst
tangerine-wallet-browser-26f1e6cbd2af9d6bb0c58871635466c459cc87d8.zip
Remove encryptor in favor of external browser-passworder
I broke out the encryptor lib into its own module on npm called browser-passworder.
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index ca4c306be..58366c26f 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -5,8 +5,9 @@ const bip39 = require('bip39')
const Transaction = require('ethereumjs-tx')
const EventEmitter = require('events').EventEmitter
const filter = require('promise-filter')
+const encryptor = require('browser-passworder')
+
const normalize = require('./lib/sig-util').normalize
-const encryptor = require('./lib/encryptor')
const messageManager = require('./lib/message-manager')
const IdStoreMigrator = require('./lib/idStore-migrator')
const BN = ethUtil.BN