Add additional check for window.crypto.random (#10)

* Add additional check for window.crypto.random * Add android crossbrowser test * Add additional check for window.crypto.random * Add android crossbrowser test * Test on Android 6 * Does requirejs test pass? * Does webpack test work? * Keep webpack test
unravelin · Aug 7, 2018 · 753e0b5 · 753e0b5
1 parent a9ea66a
commit 753e0b5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ravelinjs",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Ravelin Browser Card Encryption Library.",
   "main": "ravelin.js",
   "scripts": {

diff --git a/ravelin.js b/ravelin.js
@@ -9,7 +9,7 @@
   }
 }(typeof self !== 'undefined' ? self : this, function () {
 
-  var version = '0.0.7';
+  var version = '0.0.8';
 
   var RSAKey = (function(){
     // prng4.js - uses Arcfour as a PRNG
@@ -93,7 +93,7 @@
         for(t = 0; t < 32; ++t)
           rng_pool[rng_pptr++] = ua[t];
       }
-      if(typeof navigator !== 'undefined' && navigator.appName == "Netscape" && navigator.appVersion < "5" && window.crypto) {
+      if(typeof navigator !== 'undefined' && navigator.appName == "Netscape" && navigator.appVersion < "5" && window.crypto && window.crypto.random) {
         // Extract entropy (256 bits) from NS4 RNG if available
         var z = window.crypto.random(32);
         for(t = 0; t < z.length; ++t)

diff --git a/test/crossbrowser.conf.js b/test/crossbrowser.conf.js
@@ -135,6 +135,16 @@ exports.config = Object.assign(base, {
 
             webpackTestDisabled: true,
         },
+
+        // Android
+        {
+          build: 'ravelinjs 1.0',
+          browserName: 'Chrome',
+          deviceName: 'Nexus 9',
+          platformVersion: '6.0',
+          platformName: 'Android',
+          deviceOrientation: 'portrait',
+        },
     ].filter(
         // Filter the capabilities by name if there's a BROWSERS envvar.
         !process.env.BROWSERS ? () => true : (b) => !!~b.name.toLowerCase().indexOf(process.env.BROWSERS.toLowerCase())

diff --git a/test/test.js b/test/test.js
@@ -60,7 +60,7 @@ describe('ravelinjs', function() {
                     c.cardCiphertext != "" && c.cardCiphertext.length > 10 &&
                     c.aesKeyCiphertext != "" && c.aesKeyCiphertext.length > 10 &&
                     c.algorithm == "RSA_WITH_AES_256_GCM" &&
-                    c.ravelinjsVersion == "0.0.7"
+                    c.ravelinjsVersion == "0.0.8"
                 );
             }