diff options
| author | Dan Finlay <somniac@me.com> | 2016-12-21 03:49:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-21 03:49:40 +0800 |
| commit | 4fbea1c7b4e3ca13b76aa49c7a349a3dc2366910 (patch) | |
| tree | 03ecae327cd59e97649db941f4ef3008628ca4e8 /app/scripts/keyring-controller.js | |
| parent | 35d8f69e807df6ec84f46d14db4454494d40f299 (diff) | |
| parent | dea658a898254214203845f128959ac861d9a349 (diff) | |
| download | tangerine-wallet-browser-4fbea1c7b4e3ca13b76aa49c7a349a3dc2366910.tar.gz tangerine-wallet-browser-4fbea1c7b4e3ca13b76aa49c7a349a3dc2366910.tar.zst tangerine-wallet-browser-4fbea1c7b4e3ca13b76aa49c7a349a3dc2366910.zip | |
Merge pull request #939 from MetaMask/BrowserPassworder
Remove encryptor in favor of external browser-passworder
Diffstat (limited to 'app/scripts/keyring-controller.js')
| -rw-r--r-- | app/scripts/keyring-controller.js | 3 |
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 |