Compatibility with $2b$ hashes, fixes #30

Author: dcodeIO

bower.json

@@ -1,7 +1,7 @@
 {
     "name": "bcryptjs",
     "description": "Optimized bcrypt in plain JavaScript with zero dependencies.",
-    "version": "2.2.2",
+    "version": "2.3.0",
     "main": "dist/bcrypt-isaac.js",
     "license": "New-BSD",
     "homepage": "http://dcode.io/",

dist/bcrypt.js

@@ -1131,10 +1131,10 @@
         }
         if (salt.charAt(2) === '$')
             minor = String.fromCharCode(0),
-                offset = 3;
+            offset = 3;
         else {
             minor = salt.charAt(2);
-            if ((minor !== 'a' && minor !== 'y') || salt.charAt(3) !== '$') {
+            if ((minor !== 'a' && minor !== 'b' && minor !== 'y') || salt.charAt(3) !== '$') {
                 err = Error("Invalid salt revision: "+salt.substring(2,4));
                 if (callback) {
                     nextTick(callback.bind(this, err));

dist/bcrypt.min.js

@@ -1,7 +1,7 @@
 {
     "name": "bcryptjs",
     "description": "Optimized bcrypt in plain JavaScript with zero dependencies. Compatible to 'bcrypt'.",
-    "version": "2.2.2",
+    "version": "2.3.0",
     "author": "Daniel Wirtz <dcode@dcode.io>",
     "contributors": [
         "Shane Girish <shaneGirish@gmail.com> (https://github.com/shaneGirish)",

dist/bcrypt.min.map

@@ -497,10 +497,10 @@ function _hash(s, salt, callback, progressCallback) {
     }
     if (salt.charAt(2) === '$')
         minor = String.fromCharCode(0),
-            offset = 3;
+        offset = 3;
     else {
         minor = salt.charAt(2);
-        if ((minor !== 'a' && minor !== 'y') || salt.charAt(3) !== '$') {
+        if ((minor !== 'a' && minor !== 'b' && minor !== 'y') || salt.charAt(3) !== '$') {
             err = Error("Invalid salt revision: "+salt.substring(2,4));
             if (callback) {
                 nextTick(callback.bind(this, err));

package.json

@@ -47,13 +47,26 @@ module.exports = {
     "compareSync": function(test) {
         var salt1 = bcrypt.genSaltSync(),
             hash1 = bcrypt.hashSync("hello", salt1); // $2a$
-        var salt2 = bcrypt.genSaltSync();
-        salt2 = salt2.substring(0,2)+'y'+salt2.substring(3); // $2y$
-        var hash2 = bcrypt.hashSync("world", salt2);
+        var salt2 = bcrypt.genSaltSync().replace(/\$2a\$/, "$2y$"),
+            hash2 = bcrypt.hashSync("world", salt2);
+        var salt3 = bcrypt.genSaltSync().replace(/\$2a\$/, "$2b$"),
+            hash3 = bcrypt.hashSync("hello world", salt3);
+
+        test.strictEqual(hash1.substring(0,4), "$2a$");
         test.ok(bcrypt.compareSync("hello", hash1));
         test.notOk(bcrypt.compareSync("hello", hash2));
+        test.notOk(bcrypt.compareSync("hello", hash3));
+
+        test.strictEqual(hash2.substring(0,4), "$2y$");
         test.ok(bcrypt.compareSync("world", hash2));
         test.notOk(bcrypt.compareSync("world", hash1));
+        test.notOk(bcrypt.compareSync("world", hash3));
+
+        test.strictEqual(hash3.substring(0,4), "$2b$");
+        test.ok(bcrypt.compareSync("hello world", hash3));
+        test.notOk(bcrypt.compareSync("hello world", hash1));
+        test.notOk(bcrypt.compareSync("hello world", hash2));
+
         test.done();
     },
 
@@ -84,9 +97,7 @@ module.exports = {
 
     "getSalt": function(test) {
         var hash1 = bcrypt.hashSync("hello", bcrypt.genSaltSync());
-        test.log("Hash: "+hash1);
         var salt = bcrypt.getSalt(hash1);
-        test.log("Salt: "+salt);
         var hash2 = bcrypt.hashSync("hello", salt);
         test.equal(hash1, hash2);
         test.done();