Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptor

Fix new encryptor implementation

2 files changed, 4 insertions, 4 deletions

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 4fa2b4ee8..68cf62f7a 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -118,6 +118,7 @@ module.exports = class KeyringController extends EventEmitter {
     return this.idStoreMigrator.migratedVaultForPassword(password)
     .then((serialized) => {
       if (serialized && shouldMigrate) {
+        this.password = password
         const keyring = this.restoreKeyring(serialized)
         this.keyrings.push(keyring)
         this.configManager.setSelectedAccount(keyring.getAccounts()[0])
@@ -185,7 +186,6 @@ module.exports = class KeyringController extends EventEmitter {
       cb(null, this.getState())
     })
     .catch((err) => {
-      console.error(err)
       cb(err)
     })
   }
@@ -274,8 +274,9 @@ module.exports = class KeyringController extends EventEmitter {
 
   unlockKeyrings (password) {
     const encryptedVault = this.configManager.getVault()
-    return this.encryptor.decrypt(this.password, encryptedVault)
+    return this.encryptor.decrypt(password, encryptedVault)
     .then((vault) => {
+      this.password = password
       vault.forEach(this.restoreKeyring.bind(this))
       return this.keyrings
     })
@@ -557,7 +558,7 @@ module.exports = class KeyringController extends EventEmitter {
   }
 
   setLocked (cb) {
-    this.key = null
+    this.password = null
     this.keyrings = []
     this.emit('update')
     cb()
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,