1 files changed, 47 insertions, 45 deletions
diff --git a/app/scripts/edge-encryptor.js b/app/scripts/edge-encryptor.js
index dcb06873b..012672ed2 100644
--- a/app/scripts/edge-encryptor.js
+++ b/app/scripts/edge-encryptor.js
@@ -14,23 +14,23 @@ class EdgeEncryptor {
    * @returns {Promise<string>} Promise resolving to an object with ciphertext
    */
   encrypt (password, dataObject) {
-      var salt = this._generateSalt()
-      return this._keyFromPassword(password, salt)
-          .then(function (key) {
-              var data = JSON.stringify(dataObject)
-              var dataBuffer = Unibabel.utf8ToBuffer(data)
-              var vector = global.crypto.getRandomValues(new Uint8Array(16))
-              var resultbuffer = asmcrypto.AES_GCM.encrypt(dataBuffer, key, vector)
+    var salt = this._generateSalt()
+    return this._keyFromPassword(password, salt)
+      .then(function (key) {
+        var data = JSON.stringify(dataObject)
+        var dataBuffer = Unibabel.utf8ToBuffer(data)
+        var vector = global.crypto.getRandomValues(new Uint8Array(16))
+        var resultbuffer = asmcrypto.AES_GCM.encrypt(dataBuffer, key, vector)
 
-              var buffer = new Uint8Array(resultbuffer)
-              var vectorStr = Unibabel.bufferToBase64(vector)
-              var vaultStr = Unibabel.bufferToBase64(buffer)
-              return JSON.stringify({
-                  data: vaultStr,
-                  iv: vectorStr,
-                  salt: salt,
-              })
-          })
+        var buffer = new Uint8Array(resultbuffer)
+        var vectorStr = Unibabel.bufferToBase64(vector)
+        var vaultStr = Unibabel.bufferToBase64(buffer)
+        return JSON.stringify({
+          data: vaultStr,
+          iv: vectorStr,
+          salt: salt,
+        })
+      })
   }
 
   /**
@@ -41,25 +41,25 @@ class EdgeEncryptor {
    * @returns {Promise<Object>} Promise resolving to copy of decrypted object
    */
   decrypt (password, text) {
-      const payload = JSON.parse(text)
-      const salt = payload.salt
-      return this._keyFromPassword(password, salt)
-          .then(function (key) {
-              const encryptedData = Unibabel.base64ToBuffer(payload.data)
-              const vector = Unibabel.base64ToBuffer(payload.iv)
-              return new Promise((resolve, reject) => {
-                  var result
-                  try {
-                      result = asmcrypto.AES_GCM.decrypt(encryptedData, key, vector)
-                  } catch (err) {
-                      return reject(new Error('Incorrect password'))
-                  }
-                  const decryptedData = new Uint8Array(result)
-                  const decryptedStr = Unibabel.bufferToUtf8(decryptedData)
-                  const decryptedObj = JSON.parse(decryptedStr)
-                  resolve(decryptedObj)
-              })
-          })
+    const payload = JSON.parse(text)
+    const salt = payload.salt
+    return this._keyFromPassword(password, salt)
+      .then(function (key) {
+        const encryptedData = Unibabel.base64ToBuffer(payload.data)
+        const vector = Unibabel.base64ToBuffer(payload.iv)
+        return new Promise((resolve, reject) => {
+          var result
+          try {
+            result = asmcrypto.AES_GCM.decrypt(encryptedData, key, vector)
+          } catch (err) {
+            return reject(new Error('Incorrect password'))
+          }
+          const decryptedData = new Uint8Array(result)
+          const decryptedStr = Unibabel.bufferToUtf8(decryptedData)
+          const decryptedObj = JSON.parse(decryptedStr)
+          resolve(decryptedObj)
+        })
+      })
   }
 
   /**
@@ -72,12 +72,14 @@ class EdgeEncryptor {
    */
   _keyFromPassword (password, salt) {
 
-      var passBuffer = Unibabel.utf8ToBuffer(password)
-      var saltBuffer = Unibabel.base64ToBuffer(salt)
-      return new Promise((resolve) => {
-          var key = asmcrypto.PBKDF2_HMAC_SHA256.bytes(passBuffer, saltBuffer, 10000)
-          resolve(key)
-      })
+    var passBuffer = Unibabel.utf8ToBuffer(password)
+    var saltBuffer = Unibabel.base64ToBuffer(salt)
+    const iterations = 10000
+    const length = 32 // SHA256 hash size
+    return new Promise((resolve) => {
+      var key = asmcrypto.Pbkdf2HmacSha256(passBuffer, saltBuffer, iterations, length)
+      resolve(key)
+    })
   }
 
   /**
@@ -87,10 +89,10 @@ class EdgeEncryptor {
    * @returns {string} Randomized base64 encoded data
    */
   _generateSalt (byteCount = 32) {
-      var view = new Uint8Array(byteCount)
-      global.crypto.getRandomValues(view)
-      var b64encoded = btoa(String.fromCharCode.apply(null, view))
-      return b64encoded
+    var view = new Uint8Array(byteCount)
+    global.crypto.getRandomValues(view)
+    var b64encoded = btoa(String.fromCharCode.apply(null, view))
+    return b64encoded
   }
 }