Skip to content

Commit dd6eaf7

Browse files
committed
Prevent integer wrap-around with 31 rounds, fixes #24, fixes #25
1 parent d5d4615 commit dd6eaf7

6 files changed

Lines changed: 7 additions & 7 deletions

File tree

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bcryptjs",
33
"description": "Optimized bcrypt in plain JavaScript with zero dependencies.",
4-
"version": "2.2.0",
4+
"version": "2.2.1",
55
"main": "dist/bcrypt-isaac.js",
66
"license": "New-BSD",
77
"homepage": "http://dcode.io/",

dist/bcrypt.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@
10191019
} else
10201020
throw err;
10211021
}
1022-
rounds = 1 << rounds;
1022+
rounds = (1 << rounds) >>> 0;
10231023
var P = P_ORIG.slice(),
10241024
S = S_ORIG.slice(),
10251025
i = 0, j;

dist/bcrypt.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/bcrypt.min.map

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bcryptjs",
33
"description": "Optimized bcrypt in plain JavaScript with zero dependencies. Compatible to 'bcrypt'.",
4-
"version": "2.2.0",
4+
"version": "2.2.1",
55
"author": "Daniel Wirtz <dcode@dcode.io>",
66
"contributors": [
77
"Shane Girish <shaneGirish@gmail.com> (https://github.com/shaneGirish)",

src/bcrypt/impl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ function _crypt(b, salt, rounds, callback, progressCallback) {
406406
} else
407407
throw err;
408408
}
409-
rounds = 1 << rounds;
409+
rounds = (1 << rounds) >>> 0;
410410
var P = P_ORIG.slice(),
411411
S = S_ORIG.slice(),
412412
i = 0, j;

0 commit comments

Comments
 (0)