Prevent integer wrap-around with 31 rounds, fixes #24, fixes #25

dcodeIO · Aug 2, 2015 · dd6eaf7 · dd6eaf7
1 parent d5d4615
commit dd6eaf7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "bcryptjs",
     "description": "Optimized bcrypt in plain JavaScript with zero dependencies.",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "main": "dist/bcrypt-isaac.js",
     "license": "New-BSD",
     "homepage": "http://dcode.io/",

diff --git a/dist/bcrypt.js b/dist/bcrypt.js
@@ -1019,7 +1019,7 @@
             } else
                 throw err;
         }
-        rounds = 1 << rounds;
+        rounds = (1 << rounds) >>> 0;
         var P = P_ORIG.slice(),
             S = S_ORIG.slice(),
             i = 0, j;

diff --git a/dist/bcrypt.min.js b/dist/bcrypt.min.js
diff --git a/dist/bcrypt.min.map b/dist/bcrypt.min.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bcryptjs",
     "description": "Optimized bcrypt in plain JavaScript with zero dependencies. Compatible to 'bcrypt'.",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "author": "Daniel Wirtz <dcode@dcode.io>",
     "contributors": [
         "Shane Girish <shaneGirish@gmail.com> (https://github.com/shaneGirish)",

diff --git a/src/bcrypt/impl.js b/src/bcrypt/impl.js
@@ -406,7 +406,7 @@ function _crypt(b, salt, rounds, callback, progressCallback) {
         } else
             throw err;
     }
-    rounds = 1 << rounds;
+    rounds = (1 << rounds) >>> 0;
     var P = P_ORIG.slice(),
         S = S_ORIG.slice(),
         i = 0, j;