From 1e932e72edcd9379f4c9ef3704c43e06ad012222 Mon Sep 17 00:00:00 2001
From: Raymond Feng <raymond@strongloop.com>
Date: Wed, 3 Dec 2014 09:03:36 -0800
Subject: [PATCH 1/2] Allow native bcrypt for performance

See https://github.com/strongloop/loopback/issues/892
---
 common/models/user.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/common/models/user.js b/common/models/user.js
index 019894c5..563d0363 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -6,7 +6,16 @@ var loopback = require('../../lib/loopback');
 var path = require('path');
 var SALT_WORK_FACTOR = 10;
 var crypto = require('crypto');
-var bcrypt = require('bcryptjs');
+
+var bcrypt;
+try {
+  // Try the native module first
+  bcrypt = require('bcrypt');
+} catch (err) {
+  // Fall back to pure JS impl
+  bcrypt = require('bcryptjs');
+}
+
 var DEFAULT_TTL = 1209600; // 2 weeks in seconds
 var DEFAULT_RESET_PW_TTL = 15 * 60; // 15 mins in seconds
 var DEFAULT_MAX_TTL = 31556926; // 1 year in seconds

From ca9cd5641f30d1f43b416e9557258aa7bd1b1dec Mon Sep 17 00:00:00 2001
From: Raymond Feng <raymond@strongloop.com>
Date: Mon, 8 Dec 2014 11:21:20 -0800
Subject: [PATCH 2/2] v2.8.4

---
 CHANGES.md   | 17 +++++++++++++----
 package.json |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 038ac1e3..8c599f3f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+2014-12-08, Version 2.8.4
+=========================
+
+ * Allow native bcrypt for performance (Raymond Feng)
+
+
 2014-12-08, Version 2.8.3
 =========================
 
@@ -629,10 +635,6 @@
 
  * Enhance the error message (Raymond Feng)
 
-
-2014-07-16, Version 2.0.0-beta7
-===============================
-
  * Bump version (Raymond Feng)
 
  * 2.0.0-beta6 (Miroslav Bajtoš)
@@ -773,6 +775,13 @@
 2014-07-16, Version 1.10.0
 ==========================
 
+
+
+2014-07-16, Version 2.0.0-beta7
+===============================
+
+ * Bump version (Raymond Feng)
+
  * Remove unused dep (Raymond Feng)
 
  * Bump version and update deps (Raymond Feng)
diff --git a/package.json b/package.json
index a8074f9c..dd35db58 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loopback",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "LoopBack: Open Source Framework for Node.js",
   "homepage": "http://loopback.io",
   "keywords": [