From 1481a3ef8e3352eb74fa11c4f578d15d84c76de7 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Sat, 15 Oct 2016 10:48:12 -0700
Subject: Initial work on UI side

---
 app/scripts/keyring-controller.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/scripts/keyring-controller.js')

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index d96b9c101..5b527b0d9 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -12,6 +12,11 @@ module.exports = class KeyringController extends EventEmitter {
     this.keyChains = []
   }
 
+  keyFromPassword(password, callback) {
+    deriveKeyFromPassword(password, callback);
+  }
+
+  // Takes a pw and callback, returns a password-dervied key
   getKeyForPassword(password, callback) {
     let salt = this.configManager.getSalt()
 
-- 
cgit