From 8a2510bcb1f4f3f4636fdce7a83f6ad370097ef7 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@imobile3.com>
Date: Wed, 15 Feb 2017 19:02:55 -0500
Subject: [PATCH] utf8 encode params for key derivation

---
 src/manifest.json             | 2 +-
 src/services/cryptoService.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 1f0f22a09fb..3f7be25c223 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extName__",
   "short_name": "__MSG_appName__",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "8bit Solutions LLC",
diff --git a/src/services/cryptoService.js b/src/services/cryptoService.js
index 500f783f36d..81bed737d66 100644
--- a/src/services/cryptoService.js
+++ b/src/services/cryptoService.js
@@ -207,7 +207,8 @@ function initCryptoService() {
     };
 
     CryptoService.prototype.makeKey = function (password, salt, b64) {
-        var key = forge.pbkdf2(password, salt, 5000, 256 / 8, 'sha256');
+        var key = forge.pbkdf2(forge.util.encodeUtf8(password), forge.util.encodeUtf8(salt),
+            5000, 256 / 8, 'sha256');
 
         if (b64 && b64 === true) {
             return forge.util.encode64(key);
@@ -226,7 +227,7 @@ function initCryptoService() {
                 throw 'Invalid parameters.';
             }
 
-            var hashBits = forge.pbkdf2(key, password, 1, 256 / 8, 'sha256');
+            var hashBits = forge.pbkdf2(key, forge.util.encodeUtf8(password), 1, 256 / 8, 'sha256');
             callback(forge.util.encode64(hashBits));
         });
     };