From d959aad41f885526958382f801c932d9dbe9fe64 Mon Sep 17 00:00:00 2001
From: Richie Preece <richie.preece@gmail.com>
Date: Tue, 21 Jan 2014 20:56:12 -0700
Subject: [PATCH] Changed to bcrypt.js

---
 package.json | 4 ++--
 src/login.js | 2 +-
 src/user.js  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index bbc04c94ac..8534d01908 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
     "passport-facebook": "0.1.5",
     "less-middleware": "0.1.12",
     "marked": "0.2.8",
-    "bcrypt": "0.7.5",
     "async": "~0.2.8",
     "node-imagemagick": "0.1.8",
     "gravatar": "1.0.6",
@@ -47,7 +46,8 @@
     "semver": "~2.2.1",
     "string": "~1.7.0",
     "xregexp": "~2.0.0",
-    "socket.io-wildcard": "~0.1.1"
+    "socket.io-wildcard": "~0.1.1",
+    "bcryptjs": "~0.7.10"
   },
   "optionalDependencies": {
     "redis": "0.8.3",
diff --git a/src/login.js b/src/login.js
index c4eb226586..baa636d73a 100644
--- a/src/login.js
+++ b/src/login.js
@@ -1,5 +1,5 @@
 var user = require('./user'),
-	bcrypt = require('bcrypt'),
+	bcrypt = require('bcryptjs'),
 	db = require('./database'),
 	path = require('path'),
 	winston = require('winston'),
diff --git a/src/user.js b/src/user.js
index f9e6bc548a..10dd494b2f 100644
--- a/src/user.js
+++ b/src/user.js
@@ -1,4 +1,4 @@
-var bcrypt = require('bcrypt'),
+var bcrypt = require('bcryptjs'),
 	async = require('async'),
 	nconf = require('nconf'),
 	winston = require('winston'),