Merge branch 'master' of https://github.com/dcodeIO/bcrypt.js

Author: dcodeIO

dist/bcrypt-isaac.js

@@ -99,7 +99,7 @@
         else if (typeof rounds !== 'number')
             throw Error("Illegal arguments: "+(typeof rounds)+", "+(typeof seed_length));
         if (rounds < 4 || rounds > 31)
-            throw Error("Illegal number of rounds: "+rounds);
+            throw Error("Illegal number of rounds (4-31): "+rounds);
         var salt = [];
         salt.push("$2a$");
         if (rounds < 10)
@@ -988,7 +988,7 @@
 
         // Validate
         if (rounds < 4 || rounds > 31) {
-            err = Error("Illegal number of rounds: "+rounds);
+            err = Error("Illegal number of rounds (4-31): "+rounds);
             if (callback) {
                 nextTick(callback.bind(this, err));
                 return;

dist/bcrypt.js

@@ -95,7 +95,7 @@
         else if (typeof rounds !== 'number')
             throw Error("Illegal arguments: "+(typeof rounds)+", "+(typeof seed_length));
         if (rounds < 4 || rounds > 31)
-            throw Error("Illegal number of rounds: "+rounds);
+            throw Error("Illegal number of rounds (4-31): "+rounds);
         var salt = [];
         salt.push("$2a$");
         if (rounds < 10)
@@ -984,7 +984,7 @@
 
         // Validate
         if (rounds < 4 || rounds > 31) {
-            err = Error("Illegal number of rounds: "+rounds);
+            err = Error("Illegal number of rounds (4-31): "+rounds);
             if (callback) {
                 nextTick(callback.bind(this, err));
                 return;

src/bcrypt.js

@@ -37,7 +37,7 @@
  */
 (function(global) {
     "use strict";
-    
+
     /**
      * bcrypt namespace.
      * @type {Object.<string,*>}
@@ -104,7 +104,7 @@
         else if (typeof rounds !== 'number')
             throw Error("Illegal arguments: "+(typeof rounds)+", "+(typeof seed_length));
         if (rounds < 4 || rounds > 31)
-            throw Error("Illegal number of rounds: "+rounds);
+            throw Error("Illegal number of rounds (4-31): "+rounds);
         var salt = [];
         salt.push("$2a$");
         if (rounds < 10)
@@ -256,11 +256,11 @@
             throw Error("Illegal hash length: "+hash.length+" != 60");
         return hash.substring(0, 29);
     };
-    
+
     //? include("bcrypt/util.js");
 
     //? include("bcrypt/impl.js");
-    
+
     //? if (ISAAC) include("bcrypt/prng/isaac.js");
 
     /* CommonJS */ if (typeof module !== 'undefined' && module["exports"])
@@ -269,5 +269,5 @@
         define(function() { return bcrypt; });
     /* Global */ else
         (global["dcodeIO"] = global["dcodeIO"] || {})["bcrypt"] = bcrypt;
-    
+
 })(this);

src/bcrypt/impl.js

@@ -391,7 +391,7 @@ function _crypt(b, salt, rounds, callback, progressCallback) {
 
     // Validate
     if (rounds < 4 || rounds > 31) {
-        err = Error("Illegal number of rounds: "+rounds);
+        err = Error("Illegal number of rounds (4-31): "+rounds);
         if (callback) {
             nextTick(callback.bind(this, err));
             return;