node-forge 0.6.47 → 0.7.1

package/{js → lib}/cipher.js

@@ -5,11 +5,10 @@
  *
  * Copyright (c) 2010-2014 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./util');
 
-forge.cipher = forge.cipher || {};
+module.exports = forge.cipher = forge.cipher || {};
 
 // registered algorithms
 forge.cipher.algorithms = forge.cipher.algorithms || {};
@@ -229,58 +228,3 @@ BlockCipher.prototype.finish = function(pad) {
 
   return true;
 };
-
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'cipher';
-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));
-});
-})();

package/{js → lib}/cipherModes.js

@@ -5,15 +5,13 @@
  *
  * Copyright (c) 2010-2014 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./util');
 
 forge.cipher = forge.cipher || {};
 
 // supported cipher modes
-var modes = forge.cipher.modes = forge.cipher.modes || {};
-
+var modes = module.exports = forge.cipher.modes = forge.cipher.modes || {};
 
 /** Electronic codebook (ECB) (Don't use this; it's not secure) **/
 
@@ -96,7 +94,6 @@ modes.ecb.prototype.unpad = function(output, options) {
   return true;
 };
 
-
 /** Cipher-block Chaining (CBC) **/
 
 modes.cbc = function(options) {
@@ -198,7 +195,6 @@ modes.cbc.prototype.unpad = function(output, options) {
   return true;
 };
 
-
 /** Cipher feedback (CFB) **/
 
 modes.cfb = function(options) {
@@ -429,7 +425,6 @@ modes.ofb.prototype.encrypt = function(input, output, finish) {
 
 modes.ofb.prototype.decrypt = modes.ofb.prototype.encrypt;
 
-
 /** Counter (CTR) **/
 
 modes.ctr = function(options) {
@@ -511,7 +506,6 @@ modes.ctr.prototype.encrypt = function(input, output, finish) {
 
 modes.ctr.prototype.decrypt = modes.ctr.prototype.encrypt;
 
-
 /** Galois/Counter Mode (GCM) **/
 
 modes.gcm = function(options) {
@@ -958,7 +952,6 @@ modes.gcm.prototype.generateSubHashTable = function(mid, bits) {
   return m;
 };
 
-
 /** Utility functions */
 
 function transformIV(iv) {
@@ -992,58 +985,3 @@ function from64To32(num) {
   // convert 64-bit number to two BE Int32s
   return [(num / 0x100000000) | 0, num & 0xFFFFFFFF];
 }
-
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'cipherModes';
-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));
-});
-})();

package/{js → lib}/debug.js

@@ -5,12 +5,10 @@
  *
  * Copyright 2008-2013 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
 
 /* DEBUG API */
-forge.debug = forge.debug || {};
+module.exports = forge.debug = forge.debug || {};
 
 // Private storage for debugging.
 // Useful to expose data that is otherwise unviewable behind closures.
@@ -78,57 +76,3 @@ forge.debug.clear = function(cat, name) {
     }
   }
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'debug';
-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'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/des.js

@@ -28,12 +28,13 @@
  * Copyright (c) 2012 Stefan Siegl <stesie@brokenpipe.de>
  * Copyright (c) 2012-2014 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./cipher');
+require('./cipherModes');
+require('./util');
 
 /* DES API */
-forge.des = forge.des || {};
+module.exports = forge.des = forge.des || {};
 
 /**
  * Deprecated. Instead, use:
@@ -193,7 +194,6 @@ forge.des.Algorithm.prototype.initialize = function(options) {
   this._init = true;
 };
 
-
 /** Register DES algorithms **/
 
 registerAlgorithm('DES-ECB', forge.cipher.modes.ecb);
@@ -215,7 +215,6 @@ function registerAlgorithm(name, mode) {
   forge.cipher.registerAlgorithm(name, factory);
 }
 
-
 /** DES implementation **/
 
 var spfunction1 = [0x1010400,0,0x10000,0x1010404,0x1010004,0x10404,0x4,0x10000,0x400,0x1010400,0x1010404,0x400,0x1000404,0x1010004,0x1000000,0x4,0x404,0x1000400,0x1000400,0x10400,0x10400,0x1010000,0x1010000,0x1000404,0x10004,0x1000004,0x1000004,0x10004,0,0x404,0x10404,0x1000000,0x10000,0x1010404,0x4,0x1010000,0x1010400,0x1000000,0x1000000,0x400,0x1010004,0x10000,0x10400,0x1000004,0x400,0x4,0x1000404,0x10404,0x1010404,0x10004,0x1010000,0x1000404,0x1000004,0x404,0x10404,0x1010400,0x404,0x1000400,0x1000400,0,0x10004,0x10400,0,0x1010004];
@@ -261,7 +260,7 @@ function _createKeys(key) {
   var shifts = [0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0];
 
   var n = 0, tmp;
-  for(var j = 0; j < iterations; j ++) {
+  for(var j = 0; j < iterations; j++) {
     var left = key.getInt32();
     var right = key.getInt32();
 
@@ -494,59 +493,3 @@ function _createCipher(options) {
 
   return cipher;
 }
-
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'des';
-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', './cipher', './cipherModes', './util'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/lib/forge.js

@@ -0,0 +1,13 @@
+/**
+ * Node.js module for Forge.
+ *
+ * @author Dave Longley
+ *
+ * Copyright 2011-2016 Digital Bazaar, Inc.
+ */
+module.exports = {
+  // default options
+  options: {
+    usePureJavaScript: false
+  }
+};

package/{js → lib}/form.js

@@ -7,12 +7,12 @@
  *
  * Copyright (c) 2011-2014 Digital Bazaar, Inc. All rights reserved.
  */
-(function($) {
+var forge = require('./forge');
 
-/**
- * The form namespace.
- */
-var form = {};
+/* Form API */
+var form = module.exports = forge.form = forge.form || {};
+
+(function($) {
 
 /**
  * Regex for parsing a single name property (handles array brackets).
@@ -146,12 +146,4 @@ form.serialize = function(input, sep, dict) {
   return rval;
 };
 
-/**
- * The forge namespace and form API.
- */
-if(typeof forge === 'undefined') {
-  forge = {};
-}
-forge.form = form;
-
 })(jQuery);

package/{js → lib}/hmac.js

@@ -7,12 +7,12 @@
  *
  * Copyright (c) 2010-2012 Digital Bazaar, Inc. All rights reserved.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./md');
+require('./util');
 
 /* HMAC API */
-var hmac = forge.hmac = forge.hmac || {};
+var hmac = module.exports = forge.hmac = forge.hmac || {};
 
 /**
  * Creates an HMAC object that uses the given message digest object.
@@ -144,57 +144,3 @@ hmac.create = function() {
 
   return ctx;
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'hmac';
-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}/http.js

@@ -5,10 +5,13 @@
  *
  * Copyright (c) 2010-2014 Digital Bazaar, Inc. All rights reserved.
  */
-(function() {
+var forge = require('./forge');
+require('./debug');
+require('./tls');
+require('./util');
 
 // define http namespace
-var http = {};
+var http = module.exports = forge.http = forge.http || {};
 
 // logging category
 var cat = 'forge.http';
@@ -21,7 +24,7 @@ if(forge.debug) {
 // normalizes an http header field name
 var _normalize = function(name) {
   return name.toLowerCase().replace(/(^.)|(-.)/g,
-    function(a){return a.toUpperCase();});
+    function(a) {return a.toUpperCase();});
 };
 
 /**
@@ -566,8 +569,8 @@ http.createClient = function(options) {
     // set default dummy handlers
     var opts = {};
     opts.request = options.request;
-    opts.connected = options.connected || function(){};
-    opts.closed = options.close || function(){};
+    opts.connected = options.connected || function() {};
+    opts.closed = options.close || function() {};
     opts.headerReady = function(e) {
       // read cookies
       _readCookies(client, e.response);
@@ -575,8 +578,8 @@ http.createClient = function(options) {
         options.headerReady(e);
       }
     };
-    opts.bodyReady = options.bodyReady || function(){};
-    opts.error = options.error || function(){};
+    opts.bodyReady = options.bodyReady || function() {};
+    opts.error = options.error || function() {};
 
     // create response
     opts.response = http.createResponse();
@@ -588,11 +591,11 @@ http.createClient = function(options) {
     opts.request.abort = function() {
       // set aborted, clear handlers
       opts.request.aborted = true;
-      opts.connected = function(){};
-      opts.closed = function(){};
-      opts.headerReady = function(){};
-      opts.bodyReady = function(){};
-      opts.error = function(){};
+      opts.connected = function() {};
+      opts.closed = function() {};
+      opts.headerReady = function() {};
+      opts.bodyReady = function() {};
+      opts.error = function() {};
     };
 
     // add cookies to request
@@ -1359,11 +1362,3 @@ http.withinCookieDomain = function(url, cookie) {
 
   return rval;
 };
-
-// public access to http namespace
-if(typeof forge === 'undefined') {
-  forge = {};
-}
-forge.http = http;
-
-})();

package/lib/index.all.js

@@ -0,0 +1,16 @@
+/**
+ * Node.js module for Forge with extra utils and networking.
+ *
+ * @author Dave Longley
+ *
+ * Copyright 2011-2016 Digital Bazaar, Inc.
+ */
+module.exports = require('./forge');
+// require core forge
+require('./index');
+// additional utils and networking support
+require('./form');
+require('./socket');
+require('./tlssocket');
+require('./http');
+require('./xhr');

package/lib/index.js

@@ -0,0 +1,34 @@
+/**
+ * Node.js module for Forge.
+ *
+ * @author Dave Longley
+ *
+ * Copyright 2011-2016 Digital Bazaar, Inc.
+ */
+module.exports = require('./forge');
+require('./aes');
+require('./aesCipherSuites');
+require('./asn1');
+require('./cipher');
+require('./debug');
+require('./des');
+require('./hmac');
+require('./kem');
+require('./log');
+require('./md.all');
+require('./mgf1');
+require('./pbkdf2');
+require('./pem');
+require('./pkcs1');
+require('./pkcs12');
+require('./pkcs7');
+require('./pki');
+require('./prime');
+require('./prng');
+require('./pss');
+require('./random');
+require('./rc2');
+require('./ssh');
+require('./task');
+require('./tls');
+require('./util');

package/{js → lib}/jsbn.js

@@ -46,10 +46,9 @@ Address all questions regarding this license to:
   Tom Wu
   tjw@cs.Stanford.EDU
 */
+var forge = require('./forge');
 
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+module.exports = forge.jsbn = forge.jsbn || {};
 
 // Bits per digit
 var dbits;
@@ -66,6 +65,7 @@ function BigInteger(a,b,c) {
     else if(b == null && "string" != typeof a) this.fromString(a,256);
     else this.fromString(a,b);
 }
+forge.jsbn.BigInteger = BigInteger;
 
 // return new, unset BigInteger
 function nbi() { return new BigInteger(null); }
@@ -1262,60 +1262,3 @@ BigInteger.prototype.isProbablePrime = bnIsProbablePrime;
 //int hashCode()
 //long longValue()
 //static BigInteger valueOf(long val)
-
-forge.jsbn = forge.jsbn || {};
-forge.jsbn.BigInteger = BigInteger;
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'jsbn';
-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'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();