Add standalone support

Gruntfile.js

@@ -23,6 +23,25 @@ module.exports = function(grunt) {
           external: [ 'crypto', 'node-localstorage' ]
         }
       },
+      openpgp_sa_nodebug: {
+        files: {
+          'dist/openpgp-sa_nodebug.js': [ './src/index.js' ]
+        },
+        options: {
+          standalone: 'openpgp',
+          external: [ 'crypto', 'node-localstorage' ]
+        }
+      },
+      openpgp_sa: {
+        files: {
+          'dist/openpgp-sa.js': [ './src/index.js' ]
+        },
+        options: {
+          debug: true,
+          standalone: 'openpgp',
+          external: [ 'crypto', 'node-localstorage' ]
+        }
+      },
       unittests: {
         files: {
           'test/lib/unittests-bundle.js': []
@@ -35,7 +54,7 @@ module.exports = function(grunt) {
       }
     },
     replace: {
-      openpgpjs: {
+      openpgp: {
         src: ['dist/openpgp.js'],
         dest: ['dist/openpgp.js'],
         replacements: [{
@@ -43,21 +62,42 @@ module.exports = function(grunt) {
           to: 'OpenPGP.js v<%= pkg.version %>.<%= grunt.template.today("yyyymmdd") %>'
         }]
       },
-      openpgpjs_nodebug: {
+      openpgp_nodebug: {
         src: ['dist/openpgp_nodebug.js'],
         dest: ['dist/openpgp_nodebug.js'],
         replacements: [{
           from: /OpenPGP.js VERSION/g,
           to: 'OpenPGP.js v<%= pkg.version %>.<%= grunt.template.today("yyyymmdd") %>'
         }]
+      },
+      openpgp_sa: {
+        src: ['dist/openpgp-sa.js'],
+        dest: ['dist/openpgp-sa.js'],
+        replacements: [{
+          from: /OpenPGP.js VERSION/g,
+          to: 'OpenPGP.js v<%= pkg.version %>.<%= grunt.template.today("yyyymmdd") %>'
+        }]
+      },
+      openpgp_sa_nodebug: {
+        src: ['dist/openpgp-sa_nodebug.js'],
+        dest: ['dist/openpgp-sa_nodebug.js'],
+        replacements: [{
+          from: /OpenPGP.js VERSION/g,
+          to: 'OpenPGP.js v<%= pkg.version %>.<%= grunt.template.today("yyyymmdd") %>'
+        }]
       }
     },
     uglify: {
-      openpgpjs: {
+      openpgp: {
         files: {
           'dist/openpgp.min.js' : [ 'dist/openpgp_nodebug.js' ]
         }
       },
+      openpgp_sa: {
+        files: {
+          'dist/openpgp-sa.min.js' : [ 'dist/openpgp-sa_nodebug.js' ]
+        }
+      },
       options: {
         banner: '/*! OpenPGPjs.org  this is LGPL licensed code, see LICENSE/our website for more information.- v<%= pkg.version %> - ' +
           '<%= grunt.template.today("yyyy-mm-dd") %> */'

src/crypto/random.js

@@ -25,10 +25,8 @@
 var type_mpi = require('../type/mpi.js');
 var nodeCrypto = null;
 
-if (typeof window === undefined) {}
+if (typeof window === 'undefined') {
-try {
   nodeCrypto = require('crypto');
-} catch (e) {
 }
 
 module.exports = {
@@ -81,9 +79,9 @@ module.exports = {
    * @param {Uint32Array} buf
    */
   getRandomValues: function(buf) {
-    try {
+    if (nodeCrypto === null) {
       window.crypto.getRandomValues(buf);
-    } catch (e) {
+    } else {
       var bytes = nodeCrypto.randomBytes(4);
       buf[0] = (bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3];
     }

test/crypto/cipher/aes.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  util = openpgp.util,
+
+var util = openpgp.util,
   chai = require('chai'),
   expect = chai.expect;
 

test/crypto/cipher/blowfish.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  util = openpgp.util,
+
+var util = openpgp.util,
   BFencrypt = openpgp.crypto.cipher.blowfish,
   chai = require('chai'),
   expect = chai.expect;

test/crypto/cipher/cast5.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  util = openpgp.util,
+
+var util = openpgp.util,
   chai = require('chai'),
   expect = chai.expect;
 

test/crypto/cipher/des.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  util = openpgp.util,
+
+var util = openpgp.util,
   chai = require('chai'),
   expect = chai.expect;
 

test/crypto/cipher/twofish.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  util = openpgp.util,
+
+var util = openpgp.util,
   chai = require('chai'),
   expect = chai.expect;
 

test/crypto/crypto.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-	chai = require('chai'),
+
+var chai = require('chai'),
 	expect = chai.expect;
 
 describe('API functional testing', function() {

test/crypto/hash/md5.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  util = openpgp.util,
+
+var util = openpgp.util,
   MD5 = openpgp.crypto.hash.md5,
   chai = require('chai'),
   expect = chai.expect;

test/crypto/hash/ripemd.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  util = openpgp.util,
+
+var util = openpgp.util,
   RMDstring = openpgp.crypto.hash.ripemd,
   chai = require('chai'),
   expect = chai.expect;

test/crypto/hash/sha.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  util = openpgp.util,
+
+var util = openpgp.util,
   hash = openpgp.crypto.hash,
   chai = require('chai'),
   expect = chai.expect;

test/general/basic.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  chai = require('chai'),
+
+var chai = require('chai'),
   expect = chai.expect;
 
 describe('Basic', function() {

test/general/key.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-	chai = require('chai'),
+
+var chai = require('chai'),
 	expect = chai.expect;
 
 describe('Key', function() {

test/general/keyring.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  keyring = new openpgp.Keyring(),
+
+var keyring = new openpgp.Keyring(),
   chai = require('chai'),
   expect = chai.expect;
 

test/general/packet.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-  chai = require('chai'),
+
+var chai = require('chai'),
   expect = chai.expect;
 
 describe("Packet", function() {

test/general/signature.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var openpgp = require('openpgp'),
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('openpgp');
-	chai = require('chai'),
+
+var chai = require('chai'),
 	expect = chai.expect;
 
 describe("Signature", function() {

test/unittests.html

@@ -10,7 +10,7 @@
     <div id="mocha"></div>
 
     <!--<script src="lib/jquery.min.js"></script>-->
-    <script src="../dist/openpgp.js"></script>
+    <script src="../dist/openpgp-sa.js"></script>
     <script src="lib/chai.js"></script>
     <script src="lib/mocha.js"></script>
     <script>