added more tests and fixed missing crypto functions

brainfoolong · Nov 23, 2023 · b47997b · b47997b
1 parent 69bd4f5
commit b47997b
Show file tree

Hide file tree

Showing 12 changed files with 966 additions and 337 deletions.
diff --git a/build/dist.js b/build/dist.js
@@ -3,15 +3,19 @@ const fs = require('fs')
 
 const packageJson = require('../package.json')
 const srcFile = __dirname + '/../dist/ascon.js'
-let contents = fs.readFileSync(srcFile).toString()
+const srcFileEs6 = __dirname + '/../dist/ascon.es6.js'
+let contents = fs.readFileSync(srcFile).toString().replace('export default JsAscon;', '')
 contents = '// js-ascon v' + packageJson.version + ' @ ' + packageJson.homepage + '\n' + contents
-contents = contents.replace(/export default class JsAscon/, 'class JsAscon')
 contents += `
 if (typeof module !== 'undefined' && module.exports) {
   module.exports = JsAscon
 }
+
 if(typeof crypto === 'undefined' && typeof global !== 'undefined'){
   global.crypto = require('crypto')
 }
 `
-fs.writeFileSync(srcFile, contents)
+let contentsCommonJs = contents
+fs.writeFileSync(srcFile, contentsCommonJs)
+let contentsEs6 = contents.replace(/^class JsAscon/m, 'export default class JsAscon')
+fs.writeFileSync(srcFileEs6, contentsEs6)
diff --git a/dist/ascon.es6.js b/dist/ascon.es6.js
diff --git a/dist/ascon.js b/dist/ascon.js
@@ -1,6 +1,4 @@
 // js-ascon v1.0.0 @ https://github.com/brainfoolong/js-ascon
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Javascript / Typescript implementation of Ascon v1.2
  * Heavily inspired by the python implementation of https://github.com/meichlseder/pyascon
@@ -19,7 +17,7 @@ class JsAscon {
      */
     static encryptToHex(secretKey, messageToEncrypt, associatedData = null, cipherVariant = 'Ascon-128') {
         const key = JsAscon.hash(secretKey, 'Ascon-Xof', cipherVariant === 'Ascon-80pq' ? 20 : 16);
-        const nonce = crypto.getRandomValues(new Uint8Array(16));
+        const nonce = JsAscon.getRandomUintArray(16);
         const ciphertext = JsAscon.encrypt(key, nonce, associatedData !== null ? JSON.stringify(associatedData) : '', JSON.stringify(messageToEncrypt), cipherVariant);
         return JsAscon.byteArrayToHex(ciphertext).substring(2) + JsAscon.byteArrayToHex(nonce).substring(2);
     }
@@ -462,10 +460,12 @@ class JsAscon {
      * @return {Uint8Array}
      */
     static anyToByteArray(val) {
-        if (val instanceof Uint8Array)
+        if (val instanceof Uint8Array) {
             return val;
-        if (Array.isArray(val))
+        }
+        if (Array.isArray(val)) {
             return new Uint8Array(val);
+        }
         return new TextEncoder().encode(val);
     }
     /**
@@ -513,8 +513,9 @@ class JsAscon {
         if (offset < 0) {
             offset = byteArray.length + offset;
         }
-        if (byteArray.length - 1 < offset)
+        if (byteArray.length - 1 < offset) {
             return 0n;
+        }
         return new DataView(byteArray.buffer).getBigUint64(offset);
     }
     /**
@@ -567,6 +568,24 @@ class JsAscon {
             throw new Error(errorMessage);
         }
     }
+    /**
+     * Generate a uint array with random bytes with given length
+     * @param {number} length
+     * @return {Uint8Array}
+     */
+    static getRandomUintArray(length) {
+        if (typeof crypto === 'undefined') {
+            new Error('JsAscon requires the "crypto" library to be installed');
+        }
+        if (typeof crypto.getRandomValues === 'function') {
+            return crypto.getRandomValues(new Uint8Array(length));
+        }
+        // @ts-ignore
+        if (typeof crypto.randomBytes === 'function') {
+            // @ts-ignore
+            return JsAscon.anyToByteArray(crypto.randomBytes(length));
+        }
+    }
     /**
      * Debug output
      * @param {any} msg
@@ -594,14 +613,15 @@ class JsAscon {
 }
 JsAscon.debugEnabled = false;
 JsAscon.debugPermutationEnabled = false;
-exports.default = JsAscon;
+
 if (typeof BigInt === 'undefined') {
     throw new Error('Cannot use JsAscon library, BigInt datatype is missing');
 }
 
 if (typeof module !== 'undefined' && module.exports) {
   module.exports = JsAscon
 }
+
 if(typeof crypto === 'undefined' && typeof global !== 'undefined'){
   global.crypto = require('crypto')
 }
diff --git a/playwright.config.ts b/playwright.config.ts
diff --git a/src/ascon.ts b/src/ascon.ts
@@ -24,7 +24,7 @@ export default class JsAscon {
     cipherVariant: string = 'Ascon-128'
   ): string {
     const key = JsAscon.hash(secretKey, 'Ascon-Xof', cipherVariant === 'Ascon-80pq' ? 20 : 16)
-    const nonce = crypto.getRandomValues(new Uint8Array(16))
+    const nonce = JsAscon.getRandomUintArray(16)
     const ciphertext = JsAscon.encrypt(
       key,
       nonce,
@@ -599,8 +599,12 @@ export default class JsAscon {
    * @return {Uint8Array}
    */
   public static anyToByteArray (val: any): Uint8Array {
-    if (val instanceof Uint8Array) return val
-    if (Array.isArray(val)) return new Uint8Array(val)
+    if (val instanceof Uint8Array) {
+      return val
+    }
+    if (Array.isArray(val)) {
+      return new Uint8Array(val)
+    }
     return new TextEncoder().encode(val)
   }
 
@@ -651,7 +655,9 @@ export default class JsAscon {
     if (offset < 0) {
       offset = byteArray.length + offset
     }
-    if (byteArray.length - 1 < offset) return 0n
+    if (byteArray.length - 1 < offset) {
+      return 0n
+    }
     return new DataView(byteArray.buffer).getBigUint64(offset)
   }
 
@@ -717,6 +723,25 @@ export default class JsAscon {
     }
   }
 
+  /**
+   * Generate a uint array with random bytes with given length
+   * @param {number} length
+   * @return {Uint8Array}
+   */
+  public static getRandomUintArray (length: number): Uint8Array {
+    if (typeof crypto === 'undefined') {
+      new Error('JsAscon requires the "crypto" library to be installed')
+    }
+    if (typeof crypto.getRandomValues === 'function') {
+      return crypto.getRandomValues(new Uint8Array(length))
+    }
+    // @ts-ignore
+    if (typeof crypto.randomBytes === 'function') {
+      // @ts-ignore
+      return JsAscon.anyToByteArray(crypto.randomBytes(length))
+    }
+  }
+
   /**
    * Debug output
    * @param {any} msg

diff --git a/tests/browser-tests.html b/tests/browser-tests.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Js Ascon Browser Tests</title>
+  <script src="../dist/ascon.js"></script>
+  <script>
+    function require (file) {
+      if (file.endsWith('/ascon')) {
+        return JsAscon
+      }
+      const script = document.createElement('script')
+      script.src = file
+      document.head.append(script)
+    }
+  </script>
+  <script src="../tests/test-all.js"></script>
+  <script src="../tests/performance.js"></script>
+</head>
+<body>
+
+</body>
+</html>