node-forge 0.6.47 → 0.7.1

package/{js → lib}/prime.js

@@ -5,17 +5,21 @@
  *
  * Copyright (c) 2014 Digital Bazaar, Inc.
  */
+var forge = require('./forge');
+require('./util');
+require('./jsbn');
+require('./random');
+
 (function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
 
 // forge.prime already defined
 if(forge.prime) {
+  module.exports = forge.prime;
   return;
 }
 
 /* PRIME API */
-var prime = forge.prime = forge.prime || {};
+var prime = module.exports = forge.prime = forge.prime || {};
 
 var BigInteger = forge.jsbn.BigInteger;
 
@@ -118,6 +122,11 @@ function primeincFindPrimeWithoutWorkers(bits, rng, options, callback) {
   if('maxBlockTime' in options) {
     maxBlockTime = options.maxBlockTime;
   }
+
+  _primeinc(num, bits, rng, deltaIdx, mrTests, maxBlockTime, callback);
+}
+
+function _primeinc(num, bits, rng, deltaIdx, mrTests, maxBlockTime, callback) {
   var start = +new Date();
   do {
     // overflow, regenerate random number
@@ -132,12 +141,16 @@ function primeincFindPrimeWithoutWorkers(bits, rng, options, callback) {
     num.dAddOffset(GCD_30_DELTA[deltaIdx++ % 8], 0);
   } while(maxBlockTime < 0 || (+new Date() - start < maxBlockTime));
 
-  // keep trying (setImmediate would be better here)
+  // keep trying later
   forge.util.setImmediate(function() {
-    primeincFindPrimeWithoutWorkers(bits, rng, options, callback);
+    _primeinc(num, bits, rng, deltaIdx, mrTests, maxBlockTime, callback);
   });
 }
 
+// NOTE: This algorithm is indeterminate in nature because workers
+// run in parallel looking at different segments of numbers. Even if this
+// algorithm is run twice with the same input from a predictable RNG, it
+// may produce different outputs.
 function primeincFindPrimeWithWorkers(bits, rng, options, callback) {
   // web workers unavailable
   if(typeof Worker === 'undefined') {
@@ -281,57 +294,4 @@ function getMillerRabinTests(bits) {
   return 2;
 }
 
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'prime';
-if(typeof define !== 'function') {
-  // NodeJS -> AMD
-  if(typeof module === 'object' && module.exports) {
-    var nodeJS = true;
-    define = function(ids, factory) {
-      factory(require, module);
-    };
-  } else {
-    // <script>
-    if(typeof forge === 'undefined') {
-      forge = {};
-    }
-    return initModule(forge);
-  }
-}
-// AMD
-var deps;
-var defineFunc = function(require, module) {
-  module.exports = function(forge) {
-    var mods = deps.map(function(dep) {
-      return require(dep);
-    }).concat(initModule);
-    // handle circular dependencies
-    forge = forge || {};
-    forge.defined = forge.defined || {};
-    if(forge.defined[name]) {
-      return forge[name];
-    }
-    forge.defined[name] = true;
-    for(var i = 0; i < mods.length; ++i) {
-      mods[i](forge);
-    }
-    return forge[name];
-  };
-};
-var tmpDefine = define;
-define = function(ids, factory) {
-  deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
-  if(nodeJS) {
-    delete define;
-    return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
-  }
-  define = tmpDefine;
-  return define.apply(null, Array.prototype.slice.call(arguments, 0));
-};
-define(['require', 'module', './util', './jsbn', './random'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-
 })();

package/{js → lib}/prime.worker.js

@@ -5,7 +5,10 @@
  *
  * Copyright (c) 2013 Digital Bazaar, Inc.
  */
-importScripts('jsbn.js');
+// worker is built using CommonJS syntax to include all code in one worker file
+//importScripts('jsbn.js');
+var forge = require('./forge');
+require('./jsbn');
 
 // prime constants
 var LOW_PRIMES = [2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509,521,523,541,547,557,563,569,571,577,587,593,599,601,607,613,617,619,631,641,643,647,653,659,661,673,677,683,691,701,709,719,727,733,739,743,751,757,761,769,773,787,797,809,811,821,823,827,829,839,853,857,859,863,877,881,883,887,907,911,919,929,937,941,947,953,967,971,977,983,991,997];

package/{js → lib}/prng.js

@@ -9,19 +9,17 @@
  *
  * Copyright (c) 2010-2014 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./util');
 
-var _nodejs = (
-  typeof process !== 'undefined' && process.versions && process.versions.node);
 var _crypto = null;
-if(!forge.disableNativeCode && _nodejs && !process.versions['node-webkit']) {
+if(forge.util.isNodejs && !forge.options.usePureJavaScript &&
+  !process.versions['node-webkit']) {
   _crypto = require('crypto');
 }
 
 /* PRNG API */
-var prng = forge.prng = forge.prng || {};
+var prng = module.exports = forge.prng = forge.prng || {};
 
 /**
  * Creates a new PRNG context.
@@ -401,58 +399,3 @@ prng.create = function(plugin) {
 
   return ctx;
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'prng';
-if(typeof define !== 'function') {
-  // NodeJS -> AMD
-  if(typeof module === 'object' && module.exports) {
-    var nodeJS = true;
-    define = function(ids, factory) {
-      factory(require, module);
-    };
-  } else {
-    // <script>
-    if(typeof forge === 'undefined') {
-      forge = {};
-    }
-    return initModule(forge);
-  }
-}
-// AMD
-var deps;
-var defineFunc = function(require, module) {
-  module.exports = function(forge) {
-    var mods = deps.map(function(dep) {
-      return require(dep);
-    }).concat(initModule);
-    // handle circular dependencies
-    forge = forge || {};
-    forge.defined = forge.defined || {};
-    if(forge.defined[name]) {
-      return forge[name];
-    }
-    forge.defined[name] = true;
-    for(var i = 0; i < mods.length; ++i) {
-      mods[i](forge);
-    }
-    return forge[name];
-  };
-};
-var tmpDefine = define;
-define = function(ids, factory) {
-  deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
-  if(nodeJS) {
-    delete define;
-    return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
-  }
-  define = tmpDefine;
-  return define.apply(null, Array.prototype.slice.call(arguments, 0));
-};
-define(['require', 'module', './md', './util'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-
-})();

package/{js → lib}/pss.js

@@ -5,12 +5,12 @@
  *
  * Copyright (c) 2012 Stefan Siegl <stesie@brokenpipe.de>
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./random');
+require('./util');
 
 // shortcut for PSS API
-var pss = forge.pss = forge.pss || {};
+var pss = module.exports = forge.pss = forge.pss || {};
 
 /**
  * Creates a PSS signature scheme object.
@@ -129,7 +129,7 @@ pss.create = function(options) {
 
     /* 10. Let maskedDB = DB \xor dbMask. */
     var maskedDB = '';
-    for(i = 0; i < maskLen; i ++) {
+    for(i = 0; i < maskLen; i++) {
       maskedDB += String.fromCharCode(db.charCodeAt(i) ^ dbMask.charCodeAt(i));
     }
 
@@ -196,7 +196,7 @@ pss.create = function(options) {
 
     /* 8. Let DB = maskedDB \xor dbMask. */
     var db = '';
-    for(i = 0; i < maskLen; i ++) {
+    for(i = 0; i < maskLen; i++) {
       db += String.fromCharCode(maskedDB.charCodeAt(i) ^ dbMask.charCodeAt(i));
     }
 
@@ -209,7 +209,7 @@ pss.create = function(options) {
      * position is "position 1") does not have hexadecimal value 0x01,
      * output "inconsistent" and stop. */
     var checkLen = emLen - hLen - sLen - 2;
-    for(i = 0; i < checkLen; i ++) {
+    for(i = 0; i < checkLen; i++) {
       if(db.charCodeAt(i) !== 0x00) {
         throw new Error('Leftmost octets not zero as expected');
       }
@@ -239,57 +239,3 @@ pss.create = function(options) {
 
   return pssobj;
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'pss';
-if(typeof define !== 'function') {
-  // NodeJS -> AMD
-  if(typeof module === 'object' && module.exports) {
-    var nodeJS = true;
-    define = function(ids, factory) {
-      factory(require, module);
-    };
-  } else {
-    // <script>
-    if(typeof forge === 'undefined') {
-      forge = {};
-    }
-    return initModule(forge);
-  }
-}
-// AMD
-var deps;
-var defineFunc = function(require, module) {
-  module.exports = function(forge) {
-    var mods = deps.map(function(dep) {
-      return require(dep);
-    }).concat(initModule);
-    // handle circular dependencies
-    forge = forge || {};
-    forge.defined = forge.defined || {};
-    if(forge.defined[name]) {
-      return forge[name];
-    }
-    forge.defined[name] = true;
-    for(var i = 0; i < mods.length; ++i) {
-      mods[i](forge);
-    }
-    return forge[name];
-  };
-};
-var tmpDefine = define;
-define = function(ids, factory) {
-  deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
-  if(nodeJS) {
-    delete define;
-    return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
-  }
-  define = tmpDefine;
-  return define.apply(null, Array.prototype.slice.call(arguments, 0));
-};
-define(['require', 'module', './random', './util'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/random.js

@@ -13,12 +13,17 @@
  *
  * Copyright (c) 2009-2014 Digital Bazaar, Inc.
  */
+var forge = require('./forge');
+require('./aes');
+require('./sha256');
+require('./prng');
+require('./util');
+
 (function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
 
 // forge.random already defined
 if(forge.random && forge.random.getBytes) {
+  module.exports = forge.random;
   return;
 }
 
@@ -109,8 +114,6 @@ var _ctx = spawnPrng();
 
 // add other sources of entropy only if window.crypto.getRandomValues is not
 // available -- otherwise this source will be automatically used by the prng
-var _nodejs = (
-  typeof process !== 'undefined' && process.versions && process.versions.node);
 var getRandomValues = null;
 if(typeof window !== 'undefined') {
   var _crypto = window.crypto || window.msCrypto;
@@ -120,7 +123,8 @@ if(typeof window !== 'undefined') {
     };
   }
 }
-if(forge.disableNativeCode || (!_nodejs && !getRandomValues)) {
+if(forge.options.usePureJavaScript ||
+  (!forge.util.isNodejs && !getRandomValues)) {
   // if this is a web worker, do not use weak entropy, instead register to
   // receive strong entropy asynchronously from the main thread
   if(typeof window === 'undefined' || window.document === undefined) {
@@ -180,58 +184,8 @@ if(!forge.random) {
 // expose spawn PRNG
 forge.random.createInstance = spawnPrng;
 
-})(typeof(jQuery) !== 'undefined' ? jQuery : null);
+module.exports = forge.random;
 
-} // end module implementation
+})(typeof(jQuery) !== 'undefined' ? jQuery : null);
 
-/* ########## Begin module wrapper ########## */
-var name = 'random';
-if(typeof define !== 'function') {
-  // NodeJS -> AMD
-  if(typeof module === 'object' && module.exports) {
-    var nodeJS = true;
-    define = function(ids, factory) {
-      factory(require, module);
-    };
-  } else {
-    // <script>
-    if(typeof forge === 'undefined') {
-      forge = {};
-    }
-    return initModule(forge);
-  }
-}
-// AMD
-var deps;
-var defineFunc = function(require, module) {
-  module.exports = function(forge) {
-    var mods = deps.map(function(dep) {
-      return require(dep);
-    }).concat(initModule);
-    // handle circular dependencies
-    forge = forge || {};
-    forge.defined = forge.defined || {};
-    if(forge.defined[name]) {
-      return forge[name];
-    }
-    forge.defined[name] = true;
-    for(var i = 0; i < mods.length; ++i) {
-      mods[i](forge);
-    }
-    return forge[name];
-  };
-};
-var tmpDefine = define;
-define = function(ids, factory) {
-  deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
-  if(nodeJS) {
-    delete define;
-    return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
-  }
-  define = tmpDefine;
-  return define.apply(null, Array.prototype.slice.call(arguments, 0));
-};
-define(['require', 'module', './aes', './md', './prng', './util'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
 })();

package/{js → lib}/rc2.js

@@ -8,9 +8,8 @@
  * Information on the RC2 cipher is available from RFC #2268,
  * http://www.ietf.org/rfc/rfc2268.txt
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./util');
 
 var piTable = [
   0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79, 0x4a, 0xa0, 0xd8, 0x9d,
@@ -33,7 +32,6 @@ var piTable = [
 
 var s = [1, 2, 3, 5];
 
-
 /**
  * Rotate a word left by given number of bits.
  *
@@ -62,9 +60,8 @@ var ror = function(word, bits) {
   return ((word & 0xffff) >> bits) | ((word << (16 - bits)) & 0xffff);
 };
 
-
 /* RC2 API */
-forge.rc2 = forge.rc2 || {};
+module.exports = forge.rc2 = forge.rc2 || {};
 
 /**
  * Perform RC2 key expansion as per RFC #2268, section 2.
@@ -87,20 +84,19 @@ forge.rc2.expandKey = function(key, effKeyBits) {
   var TM = 0xff >> (T1 & 0x07);
   var i;
 
-  for(i = T; i < 128; i ++) {
+  for(i = T; i < 128; i++) {
     L.putByte(piTable[(L.at(i - 1) + L.at(i - T)) & 0xff]);
   }
 
   L.setAt(128 - T8, piTable[L.at(128 - T8) & TM]);
 
-  for(i = 127 - T8; i >= 0; i --) {
+  for(i = 127 - T8; i >= 0; i--) {
     L.setAt(i, piTable[L.at(i + 1) ^ L.at(i + T8)]);
   }
 
   return L;
 };
 
-
 /**
  * Creates a RC2 cipher object.
  *
@@ -117,7 +113,7 @@ var createCipher = function(key, bits, encrypt) {
 
   /* Expand key and fill into K[] Array */
   key = forge.rc2.expandKey(key, bits);
-  for(i = 0; i < 64; i ++) {
+  for(i = 0; i < 64; i++) {
     K.push(key.getInt16Le());
   }
 
@@ -132,7 +128,7 @@ var createCipher = function(key, bits, encrypt) {
         R[i] += K[j] + (R[(i + 3) % 4] & R[(i + 2) % 4]) +
           ((~R[(i + 3) % 4]) & R[(i + 1) % 4]);
         R[i] = rol(R[i], s[i]);
-        j ++;
+        j++;
       }
     };
 
@@ -142,7 +138,7 @@ var createCipher = function(key, bits, encrypt) {
      * @param R Array of four words to perform mashing on.
      */
     mashRound = function(R) {
-      for(i = 0; i < 4; i ++) {
+      for(i = 0; i < 4; i++) {
         R[i] += K[R[(i + 3) % 4] & 63];
       }
     };
@@ -157,7 +153,7 @@ var createCipher = function(key, bits, encrypt) {
         R[i] = ror(R[i], s[i]);
         R[i] -= K[j] + (R[(i + 3) % 4] & R[(i + 2) % 4]) +
           ((~R[(i + 3) % 4]) & R[(i + 1) % 4]);
-        j --;
+        j--;
       }
     };
 
@@ -190,7 +186,7 @@ var createCipher = function(key, bits, encrypt) {
     var R = [];
 
     /* Get data from input buffer and fill the four words into R */
-    for(i = 0; i < 4; i ++) {
+    for(i = 0; i < 4; i++) {
       var val = _input.getInt16Le();
 
       if(_iv !== null) {
@@ -210,14 +206,14 @@ var createCipher = function(key, bits, encrypt) {
     j = encrypt ? 0 : 63;
 
     /* Run execution plan. */
-    for(var ptr = 0; ptr < plan.length; ptr ++) {
-      for(var ctr = 0; ctr < plan[ptr][0]; ctr ++) {
+    for(var ptr = 0; ptr < plan.length; ptr++) {
+      for(var ctr = 0; ctr < plan[ptr][0]; ctr++) {
         plan[ptr][1](R);
       }
     }
 
     /* Write back result to output buffer. */
-    for(i = 0; i < 4; i ++) {
+    for(i = 0; i < 4; i++) {
       if(_iv !== null) {
         if(encrypt) {
           /* We're encrypting in CBC-mode, feed back encrypted bytes into
@@ -232,7 +228,6 @@ var createCipher = function(key, bits, encrypt) {
     }
   };
 
-
   /* Create cipher object */
   var cipher = null;
   cipher = {
@@ -340,7 +335,6 @@ var createCipher = function(key, bits, encrypt) {
   return cipher;
 };
 
-
 /**
  * Creates an RC2 cipher object to encrypt data in ECB or CBC mode using the
  * given symmetric key. The output will be stored in the 'output' member
@@ -414,57 +408,3 @@ forge.rc2.startDecrypting = function(key, iv, output) {
 forge.rc2.createDecryptionCipher = function(key, bits) {
   return createCipher(key, bits, false);
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'rc2';
-if(typeof define !== 'function') {
-  // NodeJS -> AMD
-  if(typeof module === 'object' && module.exports) {
-    var nodeJS = true;
-    define = function(ids, factory) {
-      factory(require, module);
-    };
-  } else {
-    // <script>
-    if(typeof forge === 'undefined') {
-      forge = {};
-    }
-    return initModule(forge);
-  }
-}
-// AMD
-var deps;
-var defineFunc = function(require, module) {
-  module.exports = function(forge) {
-    var mods = deps.map(function(dep) {
-      return require(dep);
-    }).concat(initModule);
-    // handle circular dependencies
-    forge = forge || {};
-    forge.defined = forge.defined || {};
-    if(forge.defined[name]) {
-      return forge[name];
-    }
-    forge.defined[name] = true;
-    for(var i = 0; i < mods.length; ++i) {
-      mods[i](forge);
-    }
-    return forge[name];
-  };
-};
-var tmpDefine = define;
-define = function(ids, factory) {
-  deps = (typeof ids === 'string') ? factory.slice(2) : ids.slice(2);
-  if(nodeJS) {
-    delete define;
-    return tmpDefine.apply(null, Array.prototype.slice.call(arguments, 0));
-  }
-  define = tmpDefine;
-  return define.apply(null, Array.prototype.slice.call(arguments, 0));
-};
-define(['require', 'module', './util'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();