Remove multiple forge instances feature.

- Remove abilty to create a new forge container by calling the top-level
  container with new options. Doing this correctly would add too much
  implementation complexity compared to its usefulness.
- Move global options to the forge.options object.
- Change disableNativeCode option to usePureJavaScript.

Author: davidlehn

README.md

@@ -234,36 +234,24 @@ Documentation
 
 If at any time you wish to disable the use of native code, where available,
 for particular forge features like its secure random number generator, you
-may set the ```disableNativeCode``` flag on ```forge``` to ```true```. It
-is not recommended that you set this flag as native code is typically more
+may set the ```forge.options.usePureJavaScript``` flag to ```true```. It is
+not recommended that you set this flag as native code is typically more
 performant and may have stronger security properties. It may be useful to
 set this flag to test certain features that you plan to run in environments
 that are different from your testing environment.
 
 To disable native code when including forge in the browser:
 
 ```js
-forge = {disableNativeCode: true};
-// now include forge script file(s)
-// Note: with this approach, script files *must*
-// be included after initializing the global forge var
-
-// alternatively, include script files first and then call
-forge = forge({disableNativeCode: true});
-
-// Note: forge will be permanently reconfigured now;
-// to avoid this but use the same "forge" var name,
-// you can wrap your code in a function to shadow the
-// global var, eg:
-(function(forge) {
-  // ...
-})(forge({disableNativeCode: true}));
+// run this *after* including the forge script
+forge.options.usePureJavaScript = true;
 ```
 
 To disable native code when using node.js:
 
 ```js
-var forge = require('node-forge')({disableNativeCode: true});
+var forge = require('node-forge');
+forge.options.usePureJavaScript = true;
 ```
 
 Transports

lib/forge.js

@@ -3,31 +3,11 @@
  *
  * @author Dave Longley
  *
- * Copyright 2011-2014 Digital Bazaar, Inc.
+ * Copyright 2011-2016 Digital Bazaar, Inc.
  */
-// default options
-var options;
-if(typeof forge !== 'undefined') {
-  options = forge;
-} else {
-  options = {
-    disableNativeCode: false
-  };
-}
-function makeForge(options) {
-  var self = this;
-  // create new forge container function
-  // can be called with new options to create independent copy
-  var forge = function() {
-    return makeForge(options);
-  };
-  function set(value, key) {
-    forge[key] = value;
+module.exports = {
+  // default options
+  options: {
+    usePureJavaScript: false
   }
-  // copy old properties
-  Object.keys(self).forEach(set);
-  // set options
-  Object.keys(options).forEach(set);
-  return forge;
-}
-module.exports = makeForge(options);
+};

lib/pbkdf2.js

@@ -17,7 +17,7 @@ var pkcs5 = forge.pkcs5 = forge.pkcs5 || {};
 var _nodejs = (
   typeof process !== 'undefined' && process.versions && process.versions.node);
 var crypto;
-if(_nodejs && !forge.disableNativeCode) {
+if(_nodejs && !forge.options.usePureJavaScript) {
   crypto = require('crypto');
 }
 
@@ -46,7 +46,7 @@ module.exports = forge.pbkdf2 = pkcs5.pbkdf2 = function(
 
   // 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 &&
+  if(_nodejs && !forge.options.usePureJavaScript && crypto.pbkdf2 &&
     (md === null || typeof md !== 'object') &&
     (crypto.pbkdf2Sync.length > 4 || (!md || md === 'sha1'))) {
     if(typeof md !== 'string') {

lib/prng.js

@@ -16,7 +16,8 @@ require('./util')
 var _nodejs = (
   typeof process !== 'undefined' && process.versions && process.versions.node);
 var _crypto = null;
-if(!forge.disableNativeCode && _nodejs && !process.versions['node-webkit']) {
+if(_nodejs && !forge.options.usePureJavaScript &&
+  !process.versions['node-webkit']) {
   _crypto = require('crypto');
 }
 

lib/random.js

@@ -125,7 +125,7 @@ if(typeof window !== 'undefined') {
     };
   }
 }
-if(forge.disableNativeCode || (!_nodejs && !getRandomValues)) {
+if(forge.options.usePureJavaScript || (!_nodejs && !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) {

lib/rsa.js

@@ -885,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