node-forge 0.6.47 → 0.7.1

package/{js → lib}/tls.js

@@ -230,9 +230,15 @@
  * due to the large block size of existing MACs and the small size of the
  * timing signal.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./asn1');
+require('./hmac');
+require('./md5');
+require('./pem');
+require('./pki');
+require('./random');
+require('./sha1');
+require('./util');
 
 /**
  * Generates pseudo random bytes by mixing the result of two hash functions,
@@ -4145,7 +4151,7 @@ tls.createConnection = function(options) {
 };
 
 /* TLS API */
-forge.tls = forge.tls || {};
+module.exports = forge.tls = forge.tls || {};
 
 // expose non-functions
 for(var key in tls) {
@@ -4261,66 +4267,3 @@ forge.tls.createSessionCache = tls.createSessionCache;
  * @return the new TLS connection.
  */
 forge.tls.createConnection = tls.createConnection;
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'tls';
-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',
-  './md',
-  './pem',
-  './pki',
-  './random',
-  './util'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/tlssocket.js

@@ -5,9 +5,8 @@
  *
  * Copyright (c) 2009-2012 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./tls');
 
 /**
  * Wraps a forge.net socket with a TLS layer.
@@ -40,10 +39,10 @@ forge.tls.wrapSocket = function(options) {
   var tlsSocket = {
     id: socket.id,
     // set handlers
-    connected: socket.connected || function(e){},
-    closed: socket.closed || function(e){},
-    data: socket.data || function(e){},
-    error: socket.error || function(e){}
+    connected: socket.connected || function(e) {},
+    closed: socket.closed || function(e) {},
+    data: socket.data || function(e) {},
+    error: socket.error || function(e) {}
   };
 
   // create TLS connection
@@ -248,57 +247,3 @@ forge.tls.wrapSocket = function(options) {
 
   return tlsSocket;
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'tlssocket';
-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', './tls'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/util.js

@@ -5,12 +5,10 @@
  *
  * Copyright (c) 2010-2014 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
 
 /* Utilities API */
-var util = forge.util = forge.util || {};
+var util = module.exports = forge.util = forge.util || {};
 
 // define setImmediate and nextTick
 (function() {
@@ -105,6 +103,10 @@ var util = forge.util = forge.util || {};
   util.nextTick = util.setImmediate;
 })();
 
+// check if running under Node.js
+util.isNodejs =
+  typeof process !== 'undefined' && process.versions && process.versions.node;
+
 // define isArray
 util.isArray = Array.isArray || function(x) {
   return Object.prototype.toString.call(x) === '[object Array]';
@@ -120,6 +122,21 @@ util.isArrayBufferView = function(x) {
   return x && util.isArrayBuffer(x.buffer) && x.byteLength !== undefined;
 };
 
+/**
+ * Ensure a bits param is 8, 16, 24, or 32. Used to validate input for
+ * algorithms where bit manipulation, JavaScript limitations, and/or algorithm
+ * design only allow for byte operations of a limited size.
+ *
+ * @param n number of bits.
+ *
+ * Throw Error if n invalid.
+ */
+function _checkBitsParam(n) {
+  if(!(n === 8 || n === 16 || n === 24 || n === 32)) {
+    throw new Error('Only 8, 16, 24, or 32 bits supported: ' + n);
+  }
+}
+
 // TODO: set ByteBuffer to best available backing
 util.ByteBuffer = ByteStringBuffer;
 
@@ -351,11 +368,12 @@ util.ByteStringBuffer.prototype.putInt32Le = function(i) {
  * Puts an n-bit integer in this buffer in big-endian order.
  *
  * @param i the n-bit integer.
- * @param n the number of bits in the integer.
+ * @param n the number of bits in the integer (8, 16, 24, or 32).
  *
  * @return this buffer.
  */
 util.ByteStringBuffer.prototype.putInt = function(i, n) {
+  _checkBitsParam(n);
   var bytes = '';
   do {
     n -= 8;
@@ -369,11 +387,12 @@ util.ByteStringBuffer.prototype.putInt = function(i, n) {
  * complement representation is used.
  *
  * @param i the n-bit integer.
- * @param n the number of bits in the integer.
+ * @param n the number of bits in the integer (8, 16, 24, or 32).
  *
  * @return this buffer.
  */
 util.ByteStringBuffer.prototype.putSignedInt = function(i, n) {
+  // putInt checks n
   if(i < 0) {
     i += 2 << (n - 1);
   }
@@ -492,15 +511,17 @@ util.ByteStringBuffer.prototype.getInt32Le = function() {
 
 /**
  * Gets an n-bit integer from this buffer in big-endian order and advances the
- * read pointer by n/8.
+ * read pointer by ceil(n/8).
  *
- * @param n the number of bits in the integer.
+ * @param n the number of bits in the integer (8, 16, 24, or 32).
  *
  * @return the integer.
  */
 util.ByteStringBuffer.prototype.getInt = function(n) {
+  _checkBitsParam(n);
   var rval = 0;
   do {
+    // TODO: Use (rval * 0x100) if adding support for 33 to 53 bits.
     rval = (rval << 8) + this.data.charCodeAt(this.read++);
     n -= 8;
   } while(n > 0);
@@ -511,11 +532,12 @@ util.ByteStringBuffer.prototype.getInt = function(n) {
  * Gets a signed n-bit integer from this buffer in big-endian order, using
  * two's complement, and advances the read pointer by n/8.
  *
- * @param n the number of bits in the integer.
+ * @param n the number of bits in the integer (8, 16, 24, or 32).
  *
  * @return the integer.
  */
 util.ByteStringBuffer.prototype.getSignedInt = function(n) {
+  // getInt checks n
   var x = this.getInt(n);
   var max = 2 << (n - 2);
   if(x >= max) {
@@ -674,7 +696,6 @@ util.ByteStringBuffer.prototype.toString = function() {
 
 /** End Buffer w/BinaryString backing */
 
-
 /** Buffer w/UInt8Array backing */
 
 /**
@@ -1032,11 +1053,12 @@ util.DataBuffer.prototype.putInt32Le = function(i) {
  * Puts an n-bit integer in this buffer in big-endian order.
  *
  * @param i the n-bit integer.
- * @param n the number of bits in the integer.
+ * @param n the number of bits in the integer (8, 16, 24, or 32).
  *
  * @return this buffer.
  */
 util.DataBuffer.prototype.putInt = function(i, n) {
+  _checkBitsParam(n);
   this.accommodate(n / 8);
   do {
     n -= 8;
@@ -1055,6 +1077,7 @@ util.DataBuffer.prototype.putInt = function(i, n) {
  * @return this buffer.
  */
 util.DataBuffer.prototype.putSignedInt = function(i, n) {
+  _checkBitsParam(n);
   this.accommodate(n / 8);
   if(i < 0) {
     i += 2 << (n - 1);
@@ -1151,13 +1174,15 @@ util.DataBuffer.prototype.getInt32Le = function() {
  * Gets an n-bit integer from this buffer in big-endian order and advances the
  * read pointer by n/8.
  *
- * @param n the number of bits in the integer.
+ * @param n the number of bits in the integer (8, 16, 24, or 32).
  *
  * @return the integer.
  */
 util.DataBuffer.prototype.getInt = function(n) {
+  _checkBitsParam(n);
   var rval = 0;
   do {
+    // TODO: Use (rval * 0x100) if adding support for 33 to 53 bits.
     rval = (rval << 8) + this.data.getInt8(this.read++);
     n -= 8;
   } while(n > 0);
@@ -1168,11 +1193,12 @@ util.DataBuffer.prototype.getInt = function(n) {
  * Gets a signed n-bit integer from this buffer in big-endian order, using
  * two's complement, and advances the read pointer by n/8.
  *
- * @param n the number of bits in the integer.
+ * @param n the number of bits in the integer (8, 16, 24, or 32).
  *
  * @return the integer.
  */
 util.DataBuffer.prototype.getSignedInt = function(n) {
+  // getInt checks n
   var x = this.getInt(n);
   var max = 2 << (n - 2);
   if(x >= max) {
@@ -1360,7 +1386,6 @@ util.DataBuffer.prototype.toString = function(encoding) {
 
 /** End Buffer w/UInt8Array backing */
 
-
 /**
  * Creates a buffer that stores bytes. A value may be given to put into the
  * buffer that is either a string of bytes or a UTF-16 string that will
@@ -2932,57 +2957,3 @@ util.estimateCores = function(options, callback) {
     }, 0);
   }
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'util';
-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}/x509.js

@@ -107,15 +107,23 @@
  *   signature          BIT STRING
  * }
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./aes');
+require('./asn1');
+require('./des');
+require('./md');
+require('./mgf');
+require('./oids');
+require('./pem');
+require('./pss');
+require('./rsa');
+require('./util');
 
 // 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 || {};
 var oids = pki.oids;
 
 // short name OID mappings
@@ -257,7 +265,8 @@ var x509CertificateValidator = {
         tagClass: asn1.Class.UNIVERSAL,
         type: asn1.Type.BITSTRING,
         constructed: false,
-        capture: 'certIssuerUniqueId'
+        // TODO: support arbitrary bit length ids
+        captureBitStringValue: 'certIssuerUniqueId'
       }]
     }, {
       // subjectUniqueID (optional)
@@ -271,7 +280,8 @@ var x509CertificateValidator = {
         tagClass: asn1.Class.UNIVERSAL,
         type: asn1.Type.BITSTRING,
         constructed: false,
-        capture: 'certSubjectUniqueId'
+        // TODO: support arbitrary bit length ids
+        captureBitStringValue: 'certSubjectUniqueId'
       }]
     }, {
       // Extensions (optional)
@@ -307,7 +317,7 @@ var x509CertificateValidator = {
     tagClass: asn1.Class.UNIVERSAL,
     type: asn1.Type.BITSTRING,
     constructed: false,
-    capture: 'certSignature'
+    captureBitStringValue: 'certSignature'
   }]
 };
 
@@ -478,7 +488,7 @@ var certificationRequestValidator = {
     tagClass: asn1.Class.UNIVERSAL,
     type: asn1.Type.BITSTRING,
     constructed: false,
-    capture: 'csrSignature'
+    captureBitStringValue: 'csrSignature'
   }]
 };
 
@@ -947,6 +957,7 @@ pki.createCertificate = function() {
     cert.subject.attributes = attrs;
     delete cert.subject.uniqueId;
     if(uniqueId) {
+      // TODO: support arbitrary bit length ids
       cert.subject.uniqueId = uniqueId;
     }
     cert.subject.hash = null;
@@ -964,6 +975,7 @@ pki.createCertificate = function() {
     cert.issuer.attributes = attrs;
     delete cert.issuer.uniqueId;
     if(uniqueId) {
+      // TODO: support arbitrary bit length ids
       cert.issuer.uniqueId = uniqueId;
     }
     cert.issuer.hash = null;
@@ -1264,18 +1276,9 @@ pki.certificateFromAsn1 = function(obj, computeHash) {
     throw error;
   }
 
-  // ensure signature is not interpreted as an embedded ASN.1 object
-  if(typeof capture.certSignature !== 'string') {
-    var certSignature = '\x00';
-    for(var i = 0; i < capture.certSignature.length; ++i) {
-      certSignature += asn1.toDer(capture.certSignature[i]).getBytes();
-    }
-    capture.certSignature = certSignature;
-  }
-
   // get oid
   var oid = asn1.derToOid(capture.publicKeyOid);
-  if(oid !== pki.oids['rsaEncryption']) {
+  if(oid !== pki.oids.rsaEncryption) {
     throw new Error('Cannot read public key. OID is not RSA.');
   }
 
@@ -1291,10 +1294,7 @@ pki.certificateFromAsn1 = function(obj, computeHash) {
   cert.siginfo.algorithmOid = forge.asn1.derToOid(capture.certinfoSignatureOid);
   cert.siginfo.parameters = _readSignatureParameters(cert.siginfo.algorithmOid,
     capture.certinfoSignatureParams, false);
-  // skip "unused bits" in signature value BITSTRING
-  var signature = forge.util.createBuffer(capture.certSignature);
-  ++signature.read;
-  cert.signature = signature.getBytes();
+  cert.signature = capture.certSignature;
 
   var validity = [];
   if(capture.certValidity1UTCTime !== undefined) {
@@ -1646,15 +1646,6 @@ pki.certificationRequestFromAsn1 = function(obj, computeHash) {
     throw error;
   }
 
-  // ensure signature is not interpreted as an embedded ASN.1 object
-  if(typeof capture.csrSignature !== 'string') {
-    var csrSignature = '\x00';
-    for(var i = 0; i < capture.csrSignature.length; ++i) {
-      csrSignature += asn1.toDer(capture.csrSignature[i]).getBytes();
-    }
-    capture.csrSignature = csrSignature;
-  }
-
   // get oid
   var oid = asn1.derToOid(capture.publicKeyOid);
   if(oid !== pki.oids.rsaEncryption) {
@@ -1670,10 +1661,7 @@ pki.certificationRequestFromAsn1 = function(obj, computeHash) {
   csr.siginfo.algorithmOid = forge.asn1.derToOid(capture.csrSignatureOid);
   csr.siginfo.parameters = _readSignatureParameters(
     csr.siginfo.algorithmOid, capture.csrSignatureParams, false);
-  // skip "unused bits" in signature value BITSTRING
-  var signature = forge.util.createBuffer(capture.csrSignature);
-  ++signature.read;
-  csr.signature = signature.getBytes();
+  csr.signature = capture.csrSignature;
 
   // keep CertificationRequestInfo to preserve signature when exporting
   csr.certificationRequestInfo = capture.certificationRequestInfo;
@@ -2515,6 +2503,7 @@ pki.getTBSCertificate = function(cert) {
     tbs.value.push(
       asn1.create(asn1.Class.CONTEXT_SPECIFIC, 1, true, [
         asn1.create(asn1.Class.UNIVERSAL, asn1.Type.BITSTRING, false,
+          // TODO: support arbitrary bit length ids
           String.fromCharCode(0x00) +
           cert.issuer.uniqueId
         )
@@ -2526,6 +2515,7 @@ pki.getTBSCertificate = function(cert) {
     tbs.value.push(
       asn1.create(asn1.Class.CONTEXT_SPECIFIC, 2, true, [
         asn1.create(asn1.Class.UNIVERSAL, asn1.Type.BITSTRING, false,
+          // TODO: support arbitrary bit length ids
           String.fromCharCode(0x00) +
           cert.subject.uniqueId
         )
@@ -3267,70 +3257,3 @@ pki.verifyCertificateChain = function(caStore, chain, verify) {
 
   return true;
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'x509';
-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.pki;
-  };
-};
-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',
-  './md',
-  './mgf',
-  './oids',
-  './pem',
-  './pss',
-  './rsa',
-  './util'
-], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/xhr.js

@@ -5,6 +5,13 @@
  *
  * Copyright (c) 2010-2013 Digital Bazaar, Inc.
  */
+var forge = require('./forge');
+require('./socket');
+require('./http');
+
+/* XHR API */
+var xhrApi = module.exports = forge.xhr = forge.xhr || {};
+
 (function($) {
 
 // logging category
@@ -80,16 +87,9 @@ var _clients = {};
 // the default maximum number of concurrents connections per client
 var _maxConnections = 10;
 
-// local aliases
-if(typeof forge === 'undefined') {
-  forge = {};
-}
 var net = forge.net;
 var http = forge.http;
 
-// define the xhr interface
-var xhrApi = {};
-
 /**
  * Initializes flash XHR support.
  *
@@ -328,10 +328,10 @@ xhrApi.create = function(options) {
   options = $.extend({
     logWarningOnError: true,
     verbose: false,
-    logError: function(){},
-    logWarning: function(){},
-    logDebug: function(){},
-    logVerbose: function(){},
+    logError: function() {},
+    logWarning: function() {},
+    logDebug: function() {},
+    logVerbose: function() {},
     url: null
   }, options || {});
 
@@ -446,7 +446,7 @@ xhrApi.create = function(options) {
     case 'TRACK':
       throw new Error('CONNECT, TRACE and TRACK methods are disallowed');
     default:
-      throw new Error('Invalid method: ' + method);;
+      throw new Error('Invalid method: ' + method);
     }
 
     // TODO: other validation steps in algorithm are not implemented
@@ -733,7 +733,4 @@ xhrApi.create = function(options) {
   return xhr;
 };
 
-// expose public api
-forge.xhr = xhrApi;
-
 })(jQuery);