node-forge 0.6.47 → 0.7.1

package/{js → lib}/pbkdf2.js

@@ -7,16 +7,15 @@
  *
  * Copyright (c) 2010-2013 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./hmac');
+require('./md');
+require('./util');
 
 var pkcs5 = forge.pkcs5 = forge.pkcs5 || {};
 
-var _nodejs = (
-  typeof process !== 'undefined' && process.versions && process.versions.node);
 var crypto;
-if(_nodejs && !forge.disableNativeCode) {
+if(forge.util.isNodejs && !forge.options.usePureJavaScript) {
   crypto = require('crypto');
 }
 
@@ -36,7 +35,8 @@ if(_nodejs && !forge.disableNativeCode) {
  * @return the derived key, as a binary-encoded string of bytes, for the
  *           synchronous version (if no callback is specified).
  */
-forge.pbkdf2 = pkcs5.pbkdf2 = function(p, s, c, dkLen, md, callback) {
+module.exports = forge.pbkdf2 = pkcs5.pbkdf2 = function(
+  p, s, c, dkLen, md, callback) {
   if(typeof md === 'function') {
     callback = md;
     md = null;
@@ -44,8 +44,8 @@ forge.pbkdf2 = pkcs5.pbkdf2 = function(p, s, c, dkLen, md, callback) {
 
   // use native implementation if possible and not disabled, note that
   // some node versions only support SHA-1, others allow digest to be changed
-  if(_nodejs && !forge.disableNativeCode && crypto.pbkdf2 &&
-    (md === null || typeof md !== 'object') &&
+  if(forge.util.isNodejs && !forge.options.usePureJavaScript &&
+    crypto.pbkdf2 && (md === null || typeof md !== 'object') &&
     (crypto.pbkdf2Sync.length > 4 || (!md || md === 'sha1'))) {
     if(typeof md !== 'string') {
       // default prf to SHA-1
@@ -77,7 +77,7 @@ forge.pbkdf2 = pkcs5.pbkdf2 = function(p, s, c, dkLen, md, callback) {
 
   if(typeof md === 'undefined' || md === null) {
     // default prf to SHA-1
-    md = forge.md.sha1.create();
+    md = 'sha1';
   }
   if(typeof md === 'string') {
     if(!(md in forge.md.algorithms)) {
@@ -209,57 +209,3 @@ forge.pbkdf2 = pkcs5.pbkdf2 = function(p, s, c, dkLen, md, callback) {
 
   outer();
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'pbkdf2';
-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', './hmac', './md', './util'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/pem.js

@@ -26,12 +26,11 @@
  *
  * body: the binary-encoded body.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./util');
 
 // shortcut for pem API
-var pem = forge.pem = forge.pem || {};
+var pem = module.exports = forge.pem = forge.pem || {};
 
 /**
  * Encodes (serializes) the given PEM object.
@@ -229,57 +228,3 @@ function foldHeader(header) {
 function ltrim(str) {
   return str.replace(/^\s+/, '');
 }
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'pem';
-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}/pkcs1.js

@@ -43,12 +43,13 @@
  *
  * Copyright (c) 2013-2014 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./util');
+require('./random');
+require('./sha1');
 
 // shortcut for PKCS#1 API
-var pkcs1 = forge.pkcs1 = forge.pkcs1 || {};
+var pkcs1 = module.exports = forge.pkcs1 = forge.pkcs1 || {};
 
 /**
  * Encode the given RSAES-OAEP message (M) using key, with optional label (L)
@@ -128,7 +129,7 @@ pkcs1.encode_rsa_oaep = function(key, message, options) {
     seed = forge.random.getBytes(md.digestLength);
   } else if(seed.length !== md.digestLength) {
     var error = new Error('Invalid RSAES-OAEP seed. The seed length must ' +
-      'match the digest length.')
+      'match the digest length.');
     error.seedLength = seed.length;
     error.digestLength = md.digestLength;
     throw error;
@@ -273,57 +274,3 @@ function rsa_mgf1(seed, maskLength, hash) {
   }
   return t.substring(0, maskLength);
 }
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'pkcs1';
-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', './random', './sha1'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/pkcs12.js

@@ -93,16 +93,24 @@
  *   ... -- For future extensions
  * }
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./asn1');
+require('./hmac');
+require('./oids');
+require('./pkcs7asn1');
+require('./pbe');
+require('./random');
+require('./rsa');
+require('./sha1');
+require('./util');
+require('./x509');
 
 // shortcut for asn.1 & PKI API
 var asn1 = forge.asn1;
 var pki = forge.pki;
 
 // shortcut for PKCS#12 API
-var p12 = forge.pkcs12 = forge.pkcs12 || {};
+var p12 = module.exports = forge.pkcs12 = forge.pkcs12 || {};
 
 var contentInfoValidator = {
   name: 'ContentInfo',
@@ -275,8 +283,8 @@ var certBagValidator = {
 function _getBagsByAttribute(safeContents, attrName, attrValue, bagType) {
   var result = [];
 
-  for(var i = 0; i < safeContents.length; i ++) {
-    for(var j = 0; j < safeContents[i].safeBags.length; j ++) {
+  for(var i = 0; i < safeContents.length; i++) {
+    for(var j = 0; j < safeContents[i].safeBags.length; j++) {
       var bag = safeContents[i].safeBags[j];
       if(bagType !== undefined && bag.type !== bagType) {
         continue;
@@ -518,7 +526,7 @@ function _decodeAuthenticatedSafe(pfx, authSafe, strict, password) {
       'SEQUENCE OF ContentInfo');
   }
 
-  for(var i = 0; i < authSafe.value.length; i ++) {
+  for(var i = 0; i < authSafe.value.length; i++) {
     var contentInfo = authSafe.value[i];
 
     // validate contentInfo and capture data
@@ -1064,70 +1072,3 @@ p12.toPkcs12Asn1 = function(key, cert, password, options) {
  * @return a ByteBuffer with the bytes derived from the password.
  */
 p12.generateKey = forge.pbe.generatePkcs12Key;
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'pkcs12';
-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',
-  './asn1',
-  './hmac',
-  './oids',
-  './pkcs7asn1',
-  './pbe',
-  './random',
-  './rsa',
-  './sha1',
-  './util',
-  './x509'
-], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/pkcs7.js

@@ -16,15 +16,22 @@
  * a separate file pkcs7asn1.js, since those are referenced from other
  * PKCS standards like PKCS #12.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./aes');
+require('./asn1');
+require('./des');
+require('./oids');
+require('./pem');
+require('./pkcs7asn1');
+require('./random');
+require('./util');
+require('./x509');
 
 // shortcut for ASN.1 API
 var asn1 = forge.asn1;
 
 // shortcut for PKCS#7 API
-var p7 = forge.pkcs7 = forge.pkcs7 || {};
+var p7 = module.exports = forge.pkcs7 = forge.pkcs7 || {};
 
 /**
  * Converts a PKCS#7 message from PEM format.
@@ -80,8 +87,7 @@ p7.messageFromAsn1 = function(obj) {
   // validate root level ContentInfo and capture data
   var capture = {};
   var errors = [];
-  if(!asn1.validate(obj, p7.asn1.contentInfoValidator, capture, errors))
-  {
+  if(!asn1.validate(obj, p7.asn1.contentInfoValidator, capture, errors)) {
     var error = new Error('Cannot read PKCS#7 message. ' +
       'ASN.1 object is not an PKCS#7 ContentInfo.');
     error.errors = errors;
@@ -1233,69 +1239,3 @@ function _decryptContent(msg) {
     msg.content = ciph.output;
   }
 }
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'pkcs7';
-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',
-  './asn1',
-  './des',
-  './oids',
-  './pem',
-  './pkcs7asn1',
-  './random',
-  './util',
-  './x509'
-], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/pkcs7asn1.js

@@ -107,15 +107,15 @@
  *
  * EncryptedKey ::= OCTET STRING
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./asn1');
+require('./util');
 
 // shortcut for ASN.1 API
 var asn1 = forge.asn1;
 
 // shortcut for PKCS#7 API
-var p7v = forge.pkcs7asn1 = forge.pkcs7asn1 || {};
+var p7v = module.exports = forge.pkcs7asn1 = forge.pkcs7asn1 || {};
 forge.pkcs7 = forge.pkcs7 || {};
 forge.pkcs7.asn1 = p7v;
 
@@ -407,57 +407,3 @@ p7v.recipientInfoValidator = {
     capture: 'encKey'
   }]
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'pkcs7asn1';
-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', './asn1', './util'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/pki.js

@@ -6,15 +6,23 @@
  *
  * Copyright (c) 2010-2013 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./asn1');
+require('./oids');
+require('./pbe');
+require('./pem');
+require('./pbkdf2');
+require('./pkcs12');
+require('./pss');
+require('./rsa');
+require('./util');
+require('./x509');
 
 // shortcut for asn.1 API
 var asn1 = forge.asn1;
 
 /* Public Key Infrastructure (PKI) implementation. */
-var pki = forge.pki = forge.pki || {};
+var pki = module.exports = forge.pki = forge.pki || {};
 
 /**
  * NOTE: THIS METHOD IS DEPRECATED. Use pem.decode() instead.
@@ -92,70 +100,3 @@ pki.privateKeyInfoToPem = function(pki, maxline) {
   };
   return forge.pem.encode(msg, {maxline: maxline});
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'pki';
-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',
-  './asn1',
-  './oids',
-  './pbe',
-  './pem',
-  './pbkdf2',
-  './pkcs12',
-  './pss',
-  './rsa',
-  './util',
-  './x509'
-], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();