node-forge 0.6.47 → 0.7.1

package/{js → lib}/rsa.js

@@ -61,9 +61,14 @@
  *
  * The OID for the RSA key algorithm is: 1.2.840.113549.1.1.1
  */
-(function() {
-function initModule(forge) {
-/* ########## Begin module implementation ########## */
+var forge = require('./forge');
+require('./asn1');
+require('./jsbn');
+require('./oids');
+require('./pkcs1');
+require('./prime');
+require('./random');
+require('./util');
 
 if(typeof BigInteger === 'undefined') {
   var BigInteger = forge.jsbn.BigInteger;
@@ -76,7 +81,7 @@ var asn1 = forge.asn1;
  * RSA encryption and decryption, see RFC 2313.
  */
 forge.pki = forge.pki || {};
-forge.pki.rsa = forge.rsa = forge.rsa || {};
+module.exports = forge.pki.rsa = forge.rsa = forge.rsa || {};
 var pki = forge.pki;
 
 // for finding primes, which are 30k+i for i = 1, 7, 11, 13, 17, 19, 23, 29
@@ -677,7 +682,7 @@ pki.rsa.stepKeyPairGenerationState = function(state, n) {
   var THIRTY = new BigInteger(null);
   THIRTY.fromInt(30);
   var deltaIdx = 0;
-  var op_or = function(x,y) { return x|y; };
+  var op_or = function(x, y) { return x|y; };
 
   // keep stepping until time limit is reached or done
   var t1 = +new Date();
@@ -880,7 +885,7 @@ pki.rsa.generateKeyPair = function(bits, e, options, callback) {
 
   // if native code is permitted and a callback is given, use native
   // key generation code if available and if parameters are acceptable
-  if(!forge.disableNativeCode && callback &&
+  if(!forge.options.usePureJavaScript && callback &&
     bits >= 256 && bits <= 16384 && (e === 0x10001 || e === 3)) {
     if(_detectSubtleCrypto('generateKey') && _detectSubtleCrypto('exportKey')) {
       // use standard native generateKey
@@ -892,7 +897,8 @@ pki.rsa.generateKeyPair = function(bits, e, options, callback) {
       }, true /* key can be exported*/, ['sign', 'verify'])
       .then(function(pair) {
         return window.crypto.subtle.exportKey('pkcs8', pair.privateKey);
-      }).catch(function(err) {
+      // avoiding catch(function(err) {...}) to support IE <= 8
+      }).then(undefined, function(err) {
         callback(err);
       }).then(function(pkcs8) {
         if(pkcs8) {
@@ -1788,67 +1794,3 @@ function _publicKeyFromJwk(jwk) {
 function _base64ToBigInt(b64) {
   return new BigInteger(forge.util.bytesToHex(forge.util.decode64(b64)), 16);
 }
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'rsa';
-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',
-  './jsbn',
-  './oids',
-  './pkcs1',
-  './prime',
-  './random',
-  './util'
-], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/sha1.js

@@ -5,13 +5,11 @@
  *
  * Copyright (c) 2010-2015 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./md');
+require('./util');
 
-var sha1 = forge.sha1 = forge.sha1 || {};
-forge.md = forge.md || {};
-forge.md.algorithms = forge.md.algorithms || {};
+var sha1 = module.exports = forge.sha1 = forge.sha1 || {};
 forge.md.sha1 = forge.md.algorithms.sha1 = sha1;
 
 /**
@@ -319,57 +317,3 @@ function _update(s, w, bytes) {
     len -= 64;
   }
 }
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'sha1';
-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}/sha256.js

@@ -7,13 +7,11 @@
  *
  * Copyright (c) 2010-2015 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./md');
+require('./util');
 
-var sha256 = forge.sha256 = forge.sha256 || {};
-forge.md = forge.md || {};
-forge.md.algorithms = forge.md.algorithms || {};
+var sha256 = module.exports = forge.sha256 = forge.sha256 || {};
 forge.md.sha256 = forge.md.algorithms.sha256 = sha256;
 
 /**
@@ -327,57 +325,3 @@ function _update(s, w, bytes) {
     len -= 64;
   }
 }
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'sha256';
-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}/sha512.js

@@ -10,13 +10,11 @@
  *
  * Copyright (c) 2014-2015 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./md');
+require('./util');
 
-var sha512 = forge.sha512 = forge.sha512 || {};
-forge.md = forge.md || {};
-forge.md.algorithms = forge.md.algorithms || {};
+var sha512 = module.exports = forge.sha512 = forge.sha512 || {};
 
 // SHA-512
 forge.md.sha512 = forge.md.algorithms.sha512 = sha512;
@@ -81,12 +79,26 @@ sha512.create = function(algorithm) {
     _w[wi] = new Array(2);
   }
 
+  // determine digest length by algorithm name (default)
+  var digestLength = 64;
+  switch (algorithm) {
+    case 'SHA-384':
+      digestLength = 48;
+      break;
+    case 'SHA-512/256':
+      digestLength = 32;
+      break;
+    case 'SHA-512/224':
+      digestLength = 28;
+      break;
+  }
+
   // message digest object
   var md = {
     // SHA-512 => sha512
     algorithm: algorithm.replace('-', '').toLowerCase(),
     blockLength: 128,
-    digestLength: 64,
+    digestLength: digestLength,
     // 56-bit length of message so far (does not including padding)
     messageLength: 0,
     // true message length
@@ -547,57 +559,3 @@ function _update(s, w, bytes) {
     len -= 128;
   }
 }
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'sha512';
-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}/socket.js

@@ -5,12 +5,11 @@
  *
  * Copyright (c) 2010-2013 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./util');
 
 // define net namespace
-var net = forge.net = forge.net || {};
+var net = module.exports = forge.net = forge.net || {};
 
 // map of flash ID to socket pool
 net.socketPools = {};
@@ -78,7 +77,7 @@ net.createSocketPool = function(options) {
           running javascript in the middle of its execution (BAD!) ...
           calling setTimeout() will schedule the javascript to run on
           the javascript thread and solve this EVIL problem. */
-        setTimeout(function(){sp.sockets[e.id][f](e);}, 0);
+        setTimeout(function() {sp.sockets[e.id][f](e);}, 0);
       }
     };
   } else {
@@ -145,10 +144,10 @@ net.createSocketPool = function(options) {
      var socket = {
        id: id,
        // set handlers
-       connected: options.connected || function(e){},
-       closed: options.closed || function(e){},
-       data: options.data || function(e){},
-       error: options.error || function(e){}
+       connected: options.connected || function(e) {},
+       closed: options.closed || function(e) {},
+       data: options.data || function(e) {},
+       error: options.error || function(e) {}
      };
 
      /**
@@ -286,57 +285,3 @@ net.createSocket = function(options) {
   }
   return socket;
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'net';
-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}/ssh.js

@@ -8,11 +8,14 @@
  *
  * @author https://github.com/shellac
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./aes');
+require('./hmac');
+require('./md5');
+require('./sha1');
+require('./util');
 
-var ssh = forge.ssh = forge.ssh || {};
+var ssh = module.exports = forge.ssh = forge.ssh || {};
 
 /**
  * Encodes (and optionally encrypts) a private RSA key as a Putty PPK file.
@@ -231,65 +234,3 @@ function _sha1() {
   }
   return sha.digest();
 }
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'ssh';
-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',
-  './hmac',
-  './md5',
-  './sha1',
-  './util'
-], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();

package/{js → lib}/task.js

@@ -7,9 +7,10 @@
  *
  * Copyright (c) 2009-2013 Digital Bazaar, Inc.
  */
-(function() {
-/* ########## Begin module implementation ########## */
-function initModule(forge) {
+var forge = require('./forge');
+require('./debug');
+require('./log');
+require('./util');
 
 // logging category
 var cat = 'forge.task';
@@ -617,7 +618,7 @@ var finish = function(task, suppressCallbacks) {
 };
 
 /* Tasks API */
-forge.task = forge.task || {};
+module.exports = forge.task = forge.task || {};
 
 /**
  * Starts a new task that will run the passed function asynchronously.
@@ -722,57 +723,3 @@ forge.task.createCondition = function() {
 
   return cond;
 };
-
-} // end module implementation
-
-/* ########## Begin module wrapper ########## */
-var name = 'task';
-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', './debug', './log', './util'], function() {
-  defineFunc.apply(null, Array.prototype.slice.call(arguments, 0));
-});
-})();