.covignore

@@ -0,0 +1,2 @@
+/node_modules/
+/tests/

.gitignore

@@ -1,3 +1,3 @@
 /node_modules/
-/coverage/
+/covreporter/
-/.nyc_output/
+/my_test/

.npmignore

@@ -1,7 +0,0 @@
-/node_modules/
-/coverage/
-/.nyc_output/
-/tests/
-.travis.yml
-.npmignore
-bower.json

.travis.yml

@@ -1,10 +1,12 @@
 language: node_js
 node_js:
-  - "6.11.4"
+  - "0.12.15"
-  - "8.6.0"
+  - "4.5"
+  - "6.5.0"
 before_install:
   - npm install coveralls
-after_success: npm run coveralls
+  - npm install mocha-lcov-reporter
+script: npm run-script coveralls
 branches:
   only:
     - master

CHANGELOG.md

@@ -1,40 +1,5 @@
 # Change Log
 
-## v0.9.3 / 2023-12-16
-### Fixed
-- Fix error in arrayBuffer when there are extra bytes #37
-- fixed output if finalized.
-
-## v0.9.2 / 2023-09-16
-### Fixed
-- don't modify global Array and ArrayBuffer prototypes.  #33
-- refactor: simplify formatMessage internal logic.  #34
-
-## v0.9.1 / 2023-08-31
-### Fixed
-- cSHAKE empty Array bug. #24
-
-## v0.9.0 / 2023-08-30
-### Fixed
-- cSHAKE bug. #24
-- dependencies and security issues.
-
-## v0.8.0 / 2018-08-05
-### Added
-- TypeScript definitions.
-
-### Changed
-- throw error if update after finalize
-
-## v0.7.0 / 2017-12-01
-### Added
-- AMD support.
-- support for web worker. #13
-
-### Changed
-- throw error if input type is incorrect when cSHAKE and KMAC.
-- freeze hash after finalize.
-
 ## v0.6.1 / 2017-07-03
 ### Fixed
 - Typo on variable kmac_256 type definition. #12

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2015-2023 Chen, Yi-Cyuan
+Copyright 2015-2017 Chen, Yi-Cyuan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -7,7 +7,6 @@
 A simple SHA-3 / Keccak / Shake hash function for JavaScript supports UTF-8 encoding.
 
 ## Notice
-* v0.8.0+ will throw an error if try to update hash after finalize.
 * Sha3 methods has been renamed to keccak since v0.2.0. It means that sha3 methods of v0.1.x are equal to keccak methods of v0.2.x and later.
 * `buffer` method is deprecated. This maybe confuse with Buffer in node.js. Please use `arrayBuffer` instead.
 
@@ -55,11 +54,10 @@ kmac128('key', 'Message to hash', 256, 'customization');
 kmac256('key', 'Message to hash', 512, 'customization');
 
 // Support ArrayBuffer output
-var arrayBuffer = keccak224.arrayBuffer('Message to hash');
+var buffer = keccak224.buffer('Message to hash');
 
 // Support Array output
-var bytes = keccak224.digest('Message to hash');
+var buffer = keccak224.array('Message to hash');
-var bytes = keccak224.array('Message to hash');
 
 // update hash
 sha3_512.update('Message ').update('to ').update('hash').hex();
@@ -84,46 +82,26 @@ var hash = cshake128.create(256, 'function name', 'customization');
 // specify kmac key, output bits and customization when creating
 var hash = kmac128.create('key', 256, 'customization');
 ```
-### Node.js
 If you use node.js, you should require the module first:
 ```JavaScript
-const {
+sha3_512 = require('js-sha3').sha3_512;
-  sha3_512,
+sha3_384 = require('js-sha3').sha3_384;
-  sha3_384,
+sha3_256 = require('js-sha3').sha3_256;
-  sha3_256,
+sha3_224 = require('js-sha3').sha3_224;
-  sha3_224,
+keccak512 = require('js-sha3').keccak512;
-  keccak512,
+keccak384 = require('js-sha3').keccak384;
-  keccak384,
+keccak256 = require('js-sha3').keccak256;
-  keccak256,
+keccak224 = require('js-sha3').keccak224;
-  keccak224,
+shake128 = require('js-sha3').shake128;
-  shake128,
+shake256 = require('js-sha3').shake256;
-  shake256,
+cshake128 = require('js-sha3').cshake128;
-  cshake128,
+cshake256 = require('js-sha3').cshake256;
-  cshake256,
+kmac128 = require('js-sha3').kmac128;
-  kmac128,
+kmac256 = require('js-sha3').kmac256;
-  kmac25
-} = require('js-sha3');
 ```
-
-### TypeScript
 If you use TypeScript, you can import like this:
 ```TypeScript
-import {
+import { sha3_512 } from 'js-sha3';
-  sha3_512,
-  sha3_384,
-  sha3_256,
-  sha3_224,
-  keccak512,
-  keccak384,
-  keccak256,
-  keccak224,
-  shake128,
-  shake256,
-  cshake128,
-  cshake256,
-  kmac128,
-  kmac256
-} from 'js-sha3';
 ```
 
 ## Example

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "js-sha3",
-  "version": "0.9.3",
+  "version": "0.6.1",
   "main": ["src/sha3.js"],
   "ignore": [
     "samples",

index.d.ts

@@ -42,34 +42,6 @@ interface Hash {
    */
   (message: Message): string;
 
-  /**
-   * Hash and return hex string.
-   *
-   * @param message The message you want to hash.
-   */
-  hex(message: Message): string;
-
-  /**
-   * Hash and return ArrayBuffer.
-   *
-   * @param message The message you want to hash.
-   */
-  arrayBuffer(message: Message): ArrayBuffer;
-
-  /**
-   * Hash and return integer array.
-   *
-   * @param message The message you want to hash.
-   */
-  digest(message: Message): number[];
-
-  /**
-   * Hash and return integer array.
-   *
-   * @param message The message you want to hash.
-   */
-  array(message: Message): number[];
-
   /**
    * Create a hash object.
    */
@@ -92,43 +64,10 @@ interface ShakeHash {
    */
   (message: Message, outputBits: number): string;
 
-  /**
-   * Hash and return hex string.
-   *
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   */
-  hex(message: Message, outputBits: number): string;
-
-  /**
-   * Hash and return ArrayBuffer.
-   *
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   */
-  arrayBuffer(message: Message, outputBits: number): ArrayBuffer;
-
-  /**
-   * Hash and return integer array.
-   *
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   */
-  digest(message: Message, outputBits: number): number[];
-
-  /**
-   * Hash and return integer array.
-   *
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   */
-  array(message: Message, outputBits: number): number[];
-
   /**
    * Create a hash object.
    *
    * @param outputBits The length of output.
-   * @param outputBits The length of output.
    */
   create(outputBits: number): Hasher;
 
@@ -152,54 +91,6 @@ interface CshakeHash {
    */
   (message: Message, outputBits: number, functionName: Message, customization: Message): string;
 
-  /**
-   * Hash and return hex string.
-   *
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   * @param functionName The function name string.
-   * @param customization The customization string.
-   */
-  hex(message: Message, outputBits: number, functionName: Message, customization: Message): string;
-
-  /**
-   * Hash and return ArrayBuffer.
-   *
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   * @param functionName The function name string.
-   * @param customization The customization string.
-   */
-  arrayBuffer(message: Message, outputBits: number, functionName: Message, customization: Message): ArrayBuffer;
-
-  /**
-   * Hash and return integer array.
-   *
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   * @param functionName The function name string.
-   * @param customization The customization string.
-   */
-  digest(message: Message, outputBits: number, functionName: Message, customization: Message): number[];
-
-  /**
-   * Hash and return integer array.
-   *
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   * @param functionName The function name string.
-   * @param customization The customization string.
-   */
-  array(message: Message, outputBits: number, functionName: Message, customization: Message): number[];
-
-  /**
-   * Create a hash object.
-   *
-   * @param outputBits The length of output.
-   * @param outputBits The length of output.
-   */
-  create(outputBits: number): Hasher;
-
   /**
    * Create a hash object.
    *
@@ -231,46 +122,6 @@ interface KmacHash {
    */
   (key: Message, message: Message, outputBits: number, customization: Message): string;
 
-  /**
-   * Hash and return hex string.
-   *
-   * @param key The key string.
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   * @param customization The customization string.
-   */
-  hex(key: Message, message: Message, outputBits: number, customization: Message): string;
-
-  /**
-   * Hash and return ArrayBuffer.
-   *
-   * @param key The key string.
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   * @param customization The customization string.
-   */
-  arrayBuffer(key: Message, message: Message, outputBits: number, customization: Message): ArrayBuffer;
-
-  /**
-   * Hash and return integer array.
-   *
-   * @param key The key string.
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   * @param customization The customization string.
-   */
-  digest(key: Message, message: Message, outputBits: number, customization: Message): number[];
-
-  /**
-   * Hash and return integer array.
-   *
-   * @param key The key string.
-   * @param message The message you want to hash.
-   * @param outputBits The length of output.
-   * @param customization The customization string.
-   */
-  array(key: Message, message: Message, outputBits: number, customization: Message): number[];
-
   /**
    * Create a hash object.
    *

package.json

@@ -1,20 +1,21 @@
 {
   "name": "js-sha3",
-  "version": "0.9.3",
+  "version": "0.6.1",
   "description": "A simple SHA-3 / Keccak / Shake hash function for JavaScript supports UTF-8 encoding.",
   "main": "src/sha3.js",
+  "typings": "index",
+  "types": "index.d.ts",
   "devDependencies": {
     "expect.js": "~0.3.1",
-    "mocha": "~10.2.0",
+    "jscoverage": "~0.5.9",
-    "nyc": "^15.1.0",
+    "mocha": "~2.3.2",
-    "tiny-worker": "^2.3.0",
+    "uglifyjs": "~2.4.10"
-    "uglify-js": "^3.1.9"
   },
   "scripts": {
-    "test": "nyc mocha tests/node-test.js",
+    "test": "mocha tests/node-test.js -r jscoverage",
-    "report": "nyc --reporter=html --reporter=text mocha tests/node-test.js",
+    "report": "mocha tests/node-test.js -r jscoverage --covout=html",
-    "coveralls": "nyc report --reporter=text-lcov | coveralls",
+    "coveralls": "mocha tests/node-test.js -R mocha-lcov-reporter -r jscoverage | coveralls",
-    "build": "uglifyjs src/sha3.js -c -m --comments --output build/sha3.min.js"
+    "build": "uglifyjs src/sha3.js --compress --mangle --comments --output build/sha3.min.js"
   },
   "repository": {
     "type": "git",
@@ -36,10 +37,5 @@
   "homepage": "https://github.com/emn178/js-sha3",
   "bugs": {
     "url": "https://github.com/emn178/js-sha3/issues"
-  },
-  "nyc": {
-    "exclude": [
-      "tests"
-    ]
   }
 }

src/sha3.js

@@ -1,31 +1,21 @@
 /**
  * [js-sha3]{@link https://github.com/emn178/js-sha3}
  *
- * @version 0.9.3
+ * @version 0.6.1
  * @author Chen, Yi-Cyuan [emn178@gmail.com]
- * @copyright Chen, Yi-Cyuan 2015-2023
+ * @copyright Chen, Yi-Cyuan 2015-2017
  * @license MIT
  */
 /*jslint bitwise: true */
 (function () {
   'use strict';
 
-  var INPUT_ERROR = 'input is invalid type';
+  var root = typeof window === 'object' ? window : {};
-  var FINALIZE_ERROR = 'finalize already called';
-  var WINDOW = typeof window === 'object';
-  var root = WINDOW ? window : {};
-  if (root.JS_SHA3_NO_WINDOW) {
-    WINDOW = false;
-  }
-  var WEB_WORKER = !WINDOW && typeof self === 'object';
   var NODE_JS = !root.JS_SHA3_NO_NODE_JS && typeof process === 'object' && process.versions && process.versions.node;
   if (NODE_JS) {
     root = global;
-  } else if (WEB_WORKER) {
-    root = self;
   }
   var COMMON_JS = !root.JS_SHA3_NO_COMMON_JS && typeof module === 'object' && module.exports;
-  var AMD = typeof define === 'function' && define.amd;
   var ARRAY_BUFFER = !root.JS_SHA3_NO_ARRAY_BUFFER && typeof ArrayBuffer !== 'undefined';
   var HEX_CHARS = '0123456789abcdef'.split('');
   var SHAKE_PADDING = [31, 7936, 2031616, 520093696];
@@ -40,53 +30,16 @@
             2147516545, 2147483648, 32896, 2147483648, 2147483649, 0, 2147516424, 2147483648];
   var BITS = [224, 256, 384, 512];
   var SHAKE_BITS = [128, 256];
-  var OUTPUT_TYPES = ['hex', 'buffer', 'arrayBuffer', 'array', 'digest'];
+  var OUTPUT_TYPES = ['hex', 'buffer', 'arrayBuffer', 'array'];
   var CSHAKE_BYTEPAD = {
     '128': 168,
     '256': 136
   };
 
-
+  if (root.JS_SHA3_NO_NODE_JS || !Array.isArray) {
-  var isArray = root.JS_SHA3_NO_NODE_JS || !Array.isArray
+    Array.isArray = function (obj) {
-    ? function (obj) {
       return Object.prototype.toString.call(obj) === '[object Array]';
-      }
-    : Array.isArray;
-
-  var isView = (ARRAY_BUFFER && (root.JS_SHA3_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView))
-    ? function (obj) {
-        return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
-      }
-    : ArrayBuffer.isView;
-
-  // [message: string, isString: bool]
-  var formatMessage = function (message) {
-    var type = typeof message;
-    if (type === 'string') {
-      return [message, true];
-    }
-    if (type !== 'object' || message === null) {
-      throw new Error(INPUT_ERROR);
-    }
-    if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
-      return [new Uint8Array(message), false];
-    }
-    if (!isArray(message) && !isView(message)) {
-      throw new Error(INPUT_ERROR);
-    }
-    return [message, false];
-  }
-
-  var empty = function (message) {
-    return formatMessage(message)[0].length === 0;
     };
-
-  var cloneArray = function (array) {
-    var newArray = [];
-    for (var i = 0; i < array.length; ++i) {
-      newArray[i] = array[i];
-    }
-    return newArray;
   }
 
   var createOutputMethod = function (bits, padding, outputType) {
@@ -147,7 +100,7 @@
     var w = CSHAKE_BYTEPAD[bits];
     var method = createCshakeOutputMethod(bits, padding, 'hex');
     method.create = function (outputBits, n, s) {
-      if (empty(n) && empty(s)) {
+      if (!n && !s) {
         return methods['shake' + bits].create(outputBits);
       } else {
         return new Keccak(bits, padding, outputBits).bytepad([n, s], w);
@@ -172,11 +125,11 @@
   };
 
   var algorithms = [
-    { name: 'keccak', padding: KECCAK_PADDING, bits: BITS, createMethod: createMethod },
+    {name: 'keccak', padding: KECCAK_PADDING, bits: BITS, createMethod: createMethod},
-    { name: 'sha3', padding: PADDING, bits: BITS, createMethod: createMethod },
+    {name: 'sha3', padding: PADDING, bits: BITS, createMethod: createMethod},
-    { name: 'shake', padding: SHAKE_PADDING, bits: SHAKE_BITS, createMethod: createShakeMethod },
+    {name: 'shake', padding: SHAKE_PADDING, bits: SHAKE_BITS, createMethod: createShakeMethod},
-    { name: 'cshake', padding: CSHAKE_PADDING, bits: SHAKE_BITS, createMethod: createCshakeMethod },
+    {name: 'cshake', padding: CSHAKE_PADDING, bits: SHAKE_BITS, createMethod: createCshakeMethod},
-    { name: 'kmac', padding: CSHAKE_PADDING, bits: SHAKE_BITS, createMethod: createKmacMethod }
+    {name: 'kmac', padding: CSHAKE_PADDING, bits: SHAKE_BITS, createMethod: createKmacMethod}
   ];
 
   var methods = {}, methodNames = [];
@@ -202,7 +155,6 @@
     this.padding = padding;
     this.outputBits = outputBits;
     this.reset = true;
-    this.finalized = false;
     this.block = 0;
     this.start = 0;
     this.blockCount = (1600 - (bits << 1)) >> 5;
@@ -216,13 +168,19 @@
   }
 
   Keccak.prototype.update = function (message) {
-    if (this.finalized) {
+    var notString = typeof message !== 'string';
-      throw new Error(FINALIZE_ERROR);
+    if (notString && message.constructor === root.ArrayBuffer) {
+      message = new Uint8Array(message);
     }
-    var result = formatMessage(message);
+    var length = message.length;
-    message = result[0];
+    if (notString) {
-    var isString = result[1];
+      if (typeof length !== 'number' ||
-    var blocks = this.blocks, byteCount = this.byteCount, length = message.length,
+        !Array.isArray(message) && 
+        !(ARRAY_BUFFER && ArrayBuffer.isView(message))) {
+        throw 'input is invalid type';
+      }
+    }
+    var blocks = this.blocks, byteCount = this.byteCount,
       blockCount = this.blockCount, index = 0, s = this.s, i, code;
 
     while (index < length) {
@@ -233,7 +191,11 @@
           blocks[i] = 0;
         }
       }
-      if (isString) {
+      if (notString) {
+        for (i = this.start; index < length && i < byteCount; ++index) {
+          blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
+        }
+      } else {
         for (i = this.start; index < length && i < byteCount; ++index) {
           code = message.charCodeAt(index);
           if (code < 0x80) {
@@ -253,10 +215,6 @@
             blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
           }
         }
-      } else {
-        for (i = this.start; index < length && i < byteCount; ++index) {
-          blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
-        }
       }
       this.lastByteIndex = i;
       if (i >= byteCount) {
@@ -295,11 +253,23 @@
   };
 
   Keccak.prototype.encodeString = function (str) {
-    var result = formatMessage(str);
+    str = str || '';
-    str = result[0];
+    var notString = typeof str !== 'string';
-    var isString = result[1];
+    if (notString && str.constructor === root.ArrayBuffer) {
-    var bytes = 0, length = str.length;
+      str = new Uint8Array(str);
-    if (isString) {
+    }
+    var length = str.length;
+    if (notString) {
+      if (typeof length !== 'number' ||
+        !Array.isArray(str) && 
+        !(ARRAY_BUFFER && ArrayBuffer.isView(str))) {
+        throw 'input is invalid type';
+      }
+    }
+    var bytes = 0;
+    if (notString) {
+      bytes = length;
+    } else {
       for (var i = 0; i < str.length; ++i) {
         var code = str.charCodeAt(i);
         if (code < 0x80) {
@@ -313,8 +283,6 @@
           bytes += 4;
         }
       }
-    } else {
-      bytes = length;
     }
     bytes += this.encode(bytes * 8);
     this.update(str);
@@ -323,10 +291,10 @@
 
   Keccak.prototype.bytepad = function (strs, w) {
     var bytes = this.encode(w);
-    for (var i = 0; i < strs.length; ++i) {
+    for (var i = 0;i < strs.length;++i) {
       bytes += this.encodeString(strs[i]);
     }
-    var paddingBytes = (w - bytes % w) % w;
+    var paddingBytes = w - bytes % w;
     var zeros = [];
     zeros.length = paddingBytes;
     this.update(zeros);
@@ -334,10 +302,6 @@
   };
 
   Keccak.prototype.finalize = function () {
-    if (this.finalized) {
-      return;
-    }
-    this.finalized = true;
     var blocks = this.blocks, i = this.lastByteIndex, blockCount = this.blockCount, s = this.s;
     blocks[i >> 2] |= this.padding[i & 3];
     if (this.lastByteIndex === this.byteCount) {
@@ -368,14 +332,15 @@
                HEX_CHARS[(block >> 28) & 0x0F] + HEX_CHARS[(block >> 24) & 0x0F];
       }
       if (j % blockCount === 0) {
-        s = cloneArray(s);
         f(s);
         i = 0;
       }
     }
     if (extraBytes) {
       block = s[i];
+      if (extraBytes > 0) {
         hex += HEX_CHARS[(block >> 4) & 0x0F] + HEX_CHARS[block & 0x0F];
+      }
       if (extraBytes > 1) {
         hex += HEX_CHARS[(block >> 12) & 0x0F] + HEX_CHARS[(block >> 8) & 0x0F];
       }
@@ -404,12 +369,11 @@
         array[j] = s[i];
       }
       if (j % blockCount === 0) {
-        s = cloneArray(s);
         f(s);
       }
     }
     if (extraBytes) {
-      array[j] = s[i];
+      array[i] = s[i];
       buffer = buffer.slice(0, bytes);
     }
     return buffer;
@@ -433,14 +397,15 @@
         array[offset + 3] = (block >> 24) & 0xFF;
       }
       if (j % blockCount === 0) {
-        s = cloneArray(s);
         f(s);
       }
     }
     if (extraBytes) {
       offset = j << 2;
       block = s[i];
+      if (extraBytes > 0) {
         array[offset] = block & 0xFF;
+      }
       if (extraBytes > 1) {
         array[offset + 1] = (block >> 8) & 0xFF;
       }
@@ -650,13 +615,8 @@
   if (COMMON_JS) {
     module.exports = methods;
   } else {
-    for (i = 0; i < methodNames.length; ++i) {
+    for (var i = 0; i < methodNames.length; ++i) {
       root[methodNames[i]] = methods[methodNames[i]];
     }
-    if (AMD) {
-      define(function () {
-        return methods;
-      });
-    }
   }
 })();

tests/node-test.js

@@ -1,150 +1,80 @@
 expect = require('expect.js');
-Worker = require("tiny-worker");
-
-function unset() {
-  delete require.cache[require.resolve('../src/sha3.js')];
-  delete require.cache[require.resolve('./test.js')];
-  sha3_512 = null;
-  sha3_384 = null;
-  sha3_256 = null;
-  sha3_224 = null;
-  keccak512 = null;
-  keccak384 = null;
-  keccak256 = null;
-  keccak224 = null;
-  shake128 = null;
-  shake256 = null;
-  kmac128 = null;
-  kmac256 = null;
-  BUFFER = undefined;
-  JS_SHA3_NO_WINDOW = undefined;
-  JS_SHA3_NO_NODE_JS = undefined;
-  JS_SHA3_NO_COMMON_JS = undefined;
-  JS_SHA3_NO_ARRAY_BUFFER = undefined;
-  JS_SHA3_NO_ARRAY_BUFFER_IS_VIEW = undefined;
-  window = undefined;
-}
-
-function requireToGlobal() {
-  var sha3 = require('../src/sha3.js');
-  keccak512 = sha3.keccak512;
-  keccak384 = sha3.keccak384;
-  keccak256 = sha3.keccak256;
-  keccak224 = sha3.keccak224;
-  sha3_512 = sha3.sha3_512;
-  sha3_384 = sha3.sha3_384;
-  sha3_256 = sha3.sha3_256;
-  sha3_224 = sha3.sha3_224;
-  shake128 = sha3.shake128;
-  shake256 = sha3.shake256;
-  cshake128 = sha3.cshake128;
-  cshake256 = sha3.cshake256;
-  kmac128 = sha3.kmac128;
-  kmac256 = sha3.kmac256;
-}
-
-function runCommonJsTest() {
-  requireToGlobal();
-  require('./test.js');
-  unset();
-}
-
-function runWindowTest(extra) {
-  window = global;
-  require('../src/sha3.js');
-  require('./test.js');
-  if (extra) {
-    require('./test-shake.js');
-    require('./test-cshake.js');
-    require('./test-kmac.js');
-  }
-  unset();
-}
 
 // Node.js env
-BUFFER = true;
+var sha3 = require('../src/sha3.js');
-runCommonJsTest();
+keccak512 = sha3.keccak512;
+keccak384 = sha3.keccak384;
+keccak256 = sha3.keccak256;
+keccak224 = sha3.keccak224;
+sha3_512 = sha3.sha3_512;
+sha3_384 = sha3.sha3_384;
+sha3_256 = sha3.sha3_256;
+sha3_224 = sha3.sha3_224;
+shake128 = sha3.shake128;
+shake256 = sha3.shake256;
+cshake128 = sha3.cshake128;
+cshake256 = sha3.cshake256;
+kmac128 = sha3.kmac128;
+kmac256 = sha3.kmac256;
+require('./test.js');
+require('./test-shake.js');
+require('./test-cshake.js');
+require('./test-kmac.js');
+
+delete require.cache[require.resolve('../src/sha3.js')];
+delete require.cache[require.resolve('./test.js')];
+delete require.cache[require.resolve('./test-shake.js')];
+delete require.cache[require.resolve('./test-cshake.js')];
+delete require.cache[require.resolve('./test-kmac.js')];
 
 // Webpack browser env
 JS_SHA3_NO_NODE_JS = true;
 window = global;
-runCommonJsTest();
+expect = require('expect.js');
+var sha3 = require('../src/sha3.js');
+keccak512 = sha3.keccak512;
+keccak384 = sha3.keccak384;
+keccak256 = sha3.keccak256;
+keccak224 = sha3.keccak224;
+sha3_512 = sha3.sha3_512;
+sha3_384 = sha3.sha3_384;
+sha3_256 = sha3.sha3_256;
+sha3_224 = sha3.sha3_224;
+shake128 = sha3.shake128;
+shake256 = sha3.shake256;
+cshake128 = sha3.cshake128;
+cshake256 = sha3.cshake256;
+kmac128 = sha3.kmac128;
+kmac256 = sha3.kmac256;
+require('./test.js');
+require('./test-shake.js');
+require('./test-cshake.js');
+require('./test-kmac.js');
+
+delete require.cache[require.resolve('../src/sha3.js')];
+delete require.cache[require.resolve('./test.js')];
+delete require.cache[require.resolve('./test-shake.js')];
+delete require.cache[require.resolve('./test-cshake.js')];
+delete require.cache[require.resolve('./test-kmac.js')];
+sha3_512 = null;
+sha3_384 = null;
+sha3_256 = null;
+sha3_224 = null;
+keccak512 = null;
+keccak384 = null;
+keccak256 = null;
+keccak224 = null;
+shake128 = null;
+shake256 = null;
+kmac128 = null;
+kmac256 = null;
 
 // browser env
 JS_SHA3_NO_NODE_JS = true;
 JS_SHA3_NO_COMMON_JS = true;
-runWindowTest(true);
-
-// browser env and no array buffer
-JS_SHA3_NO_NODE_JS = true;
-JS_SHA3_NO_COMMON_JS = true;
-JS_SHA3_NO_ARRAY_BUFFER = true;
-runWindowTest();
-
-// browser env and no isView
-JS_SHA3_NO_NODE_JS = true;
-JS_SHA3_NO_COMMON_JS = true;
-JS_SHA3_NO_ARRAY_BUFFER_IS_VIEW = true;
-runWindowTest();
-
-// browser AMD
-JS_SHA3_NO_NODE_JS = true;
-JS_SHA3_NO_COMMON_JS = true;
-JS_SHA3_NO_ARRAY_BUFFER_IS_VIEW = false;
 window = global;
-define = function (func) {
-  sha3 = func();
-  keccak512 = sha3.keccak512;
-  keccak384 = sha3.keccak384;
-  keccak256 = sha3.keccak256;
-  keccak224 = sha3.keccak224;
-  sha3_512 = sha3.sha3_512;
-  sha3_384 = sha3.sha3_384;
-  sha3_256 = sha3.sha3_256;
-  sha3_224 = sha3.sha3_224;
-  shake128 = sha3.shake128;
-  shake256 = sha3.shake256;
-  cshake128 = sha3.cshake128;
-  cshake256 = sha3.cshake256;
-  kmac128 = sha3.kmac128;
-  kmac256 = sha3.kmac256;
-  require('./test.js');
-};
-define.amd = true;
-
 require('../src/sha3.js');
-unset();
+require('./test.js');
-
+require('./test-shake.js');
-// webworker
+require('./test-cshake.js');
-WORKER = 'tests/worker.js';
+require('./test-kmac.js');
-SOURCE = 'src/sha3.js';
-
-require('./worker-test.js');
-
-delete require.cache[require.resolve('./worker-test.js')];
-
-// cover webworker
-JS_SHA3_NO_WINDOW = true;
-JS_SHA3_NO_NODE_JS = true;
-WORKER = './worker.js';
-SOURCE = '../src/sha3.js';
-window = global;
-self = global;
-
-Worker = function (file) {
-  require(file);
-  currentWorker = this;
-
-  this.postMessage = function (data) {
-    onmessage({data: data});
-  };
-}
-
-postMessage = function (data) {
-  currentWorker.onmessage({data: data});
-}
-
-importScripts = function () {};
-
-requireToGlobal();
-require('./worker-test.js');

tests/test-cshake.js

@@ -25,27 +25,6 @@
           n: '',
           s: '',
           output: '7f9c2ba4e88f827d616045507605853ed73b8093f6efbc88eb1a6eacfa66ef26'
-        },
-        {
-          input: [],
-          bits: 256,
-          n: [],
-          s: [],
-          output: '7f9c2ba4e88f827d616045507605853ed73b8093f6efbc88eb1a6eacfa66ef26'
-        },
-        {
-          input: [],
-          bits: 256,
-          n: new ArrayBuffer(0),
-          s: new ArrayBuffer(0),
-          output: '7f9c2ba4e88f827d616045507605853ed73b8093f6efbc88eb1a6eacfa66ef26'
-        },
-        {
-          input: [],
-          bits: 256,
-          n: new Uint8Array([]),
-          s: new Uint8Array([]),
-          output: '7f9c2ba4e88f827d616045507605853ed73b8093f6efbc88eb1a6eacfa66ef26'
         }
       ]
     },

tests/test-kmac.js

@@ -94,13 +94,6 @@
           key: [0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F],
           s: 'My Tagged Application',
           output: 'b58618f71f92e1d56c1b8c55ddd7cd188b97b4ca4d99831eb2699a837da2e4d970fbacfde50033aea585f1a2708510c32d07880801bd182898fe476876fc8965'
-        },
-        {
-          input: [],
-          bits: 128,
-          key: [],
-          s: [8, 79, 237, 8, 185, 120, 175, 77, 125, 25, 106, 116, 70, 168, 107, 88, 0, 158, 99, 107, 97, 29, 177, 98, 17, 182, 90, 154, 173, 255, 41, 197, 8, 79, 237, 8, 185, 120, 175, 77, 125, 25, 106, 116, 70, 168, 107, 88, 0, 158, 99, 107, 97, 29, 177, 98, 17, 182, 90, 154, 173, 255, 41, 197, 8, 79, 237, 8, 185, 120, 175, 77, 125, 25, 106, 116, 70, 168, 107, 88, 0, 158, 99, 107, 97, 29, 177, 98, 17, 182, 90, 154, 173, 255, 41, 197, 8, 79, 237, 8, 185, 120, 175, 77, 125, 25, 106, 116, 70, 168, 107, 88, 0, 158, 99, 107, 97, 29, 177, 98, 17, 182, 90, 154, 173],
-          output: '031801b0b50ebeef772fbe7a279bc144'
         }
       ]
     }

tests/test-shake.js

@@ -27,7 +27,6 @@
       it('should be equal', function () {
         expect(shake128('', 16)).to.be('7f9c');
         expect(shake128('', 24)).to.be('7f9c2b');
-        expect(shake128.array('', 8)).to.eql([0x7f]);
         expect(shake128.array('', 16)).to.eql([0x7f, 0x9c]);
         expect(shake128.array('', 24)).to.eql([0x7f, 0x9c, 0x2b]);
       });
@@ -35,9 +34,9 @@
 
     context('with 8 output ArrayBuffer', function () {
       it('should be equal', function () {
-        expect(shake128.arrayBuffer('', 8).toHexString()).to.be('7f');
+        expect(shake128.buffer('', 8).toHexString()).to.be('7f');
-        expect(shake128.arrayBuffer('The quick brown fox jumps over the lazy dog', 8).toHexString()).to.be('f4');
+        expect(shake128.buffer('The quick brown fox jumps over the lazy dog', 8).toHexString()).to.be('f4');
-        expect(shake128.arrayBuffer('The quick brown fox jumps over the lazy dof', 8).toHexString()).to.be('85');
+        expect(shake128.buffer('The quick brown fox jumps over the lazy dof', 8).toHexString()).to.be('85');
       });
     });
 
@@ -55,7 +54,6 @@
         expect(shake256('', 512)).to.be('46b9dd2b0ba88d13233b3feb743eeb243fcd52ea62b81b82b50c27646ed5762fd75dc4ddd8c0f200cb05019d67b592f6fc821c49479ab48640292eacb3b7c4be');
       });
     });
-
     context('with 8 output', function () {
       it('should be equal', function () {
         expect(shake256('', 8)).to.be('46');
@@ -85,11 +83,11 @@
       it('should be equal', function () {
         // https://raw.githubusercontent.com/gvanas/KeccakCodePackage/master/TestVectors/ShortMsgKAT_SHAKE256.txt
         // Len = 0, Msg = 00
-        expect(shake256.arrayBuffer('', 4100).toHexString()).to.be('46b9dd2b0ba88d13233b3feb743eeb243fcd52ea62b81b82b50c27646ed5762fd75dc4ddd8c0f200cb05019d67b592f6fc821c49479ab48640292eacb3b7c4be141e96616fb13957692cc7edd0b45ae3dc07223c8e92937bef84bc0eab862853349ec75546f58fb7c2775c38462c5010d846c185c15111e595522a6bcd16cf86f3d122109e3b1fdd943b6aec468a2d621a7c06c6a957c62b54dafc3be87567d677231395f6147293b68ceab7a9e0c58d864e8efde4e1b9a46cbe854713672f5caaae314ed9083dab4b099f8e300f01b8650f1f4b1d8fcf3f3cb53fb8e9eb2ea203bdc970f50ae55428a91f7f53ac266b28419c3778a15fd248d339ede785fb7f5a1aaa96d313eacc890936c173cdcd0fab882c45755feb3aed96d477ff96390bf9a66d1368b208e21f7c10d04a3dbd4e360633e5db4b602601c14cea737db3dcf722632cc77851cbdde2aaf0a33a07b373445df490cc8fc1e4160ff118378f11f0477de055a81a9eda57a4a2cfb0c83929d310912f729ec6cfa36c6ac6a75837143045d791cc85eff5b21932f23861bcf23a52b5da67eaf7baae0f5fb1369db78f3ac45f8c4ac5671d85735cdddb09d2b1e34a1fc066ff4a162cb263d6541274ae2fcc865f618abe27c124cd8b074ccd516301b91875824d09958f341ef274bdab0bae316339894304e35877b0c28a9b1fd166c796b9cc258a064a8f57e27f2a');
+        expect(shake256.buffer('', 4100).toHexString()).to.be('46b9dd2b0ba88d13233b3feb743eeb243fcd52ea62b81b82b50c27646ed5762fd75dc4ddd8c0f200cb05019d67b592f6fc821c49479ab48640292eacb3b7c4be141e96616fb13957692cc7edd0b45ae3dc07223c8e92937bef84bc0eab862853349ec75546f58fb7c2775c38462c5010d846c185c15111e595522a6bcd16cf86f3d122109e3b1fdd943b6aec468a2d621a7c06c6a957c62b54dafc3be87567d677231395f6147293b68ceab7a9e0c58d864e8efde4e1b9a46cbe854713672f5caaae314ed9083dab4b099f8e300f01b8650f1f4b1d8fcf3f3cb53fb8e9eb2ea203bdc970f50ae55428a91f7f53ac266b28419c3778a15fd248d339ede785fb7f5a1aaa96d313eacc890936c173cdcd0fab882c45755feb3aed96d477ff96390bf9a66d1368b208e21f7c10d04a3dbd4e360633e5db4b602601c14cea737db3dcf722632cc77851cbdde2aaf0a33a07b373445df490cc8fc1e4160ff118378f11f0477de055a81a9eda57a4a2cfb0c83929d310912f729ec6cfa36c6ac6a75837143045d791cc85eff5b21932f23861bcf23a52b5da67eaf7baae0f5fb1369db78f3ac45f8c4ac5671d85735cdddb09d2b1e34a1fc066ff4a162cb263d6541274ae2fcc865f618abe27c124cd8b074ccd516301b91875824d09958f341ef274bdab0bae316339894304e35877b0c28a9b1fd166c796b9cc258a064a8f57e27f2a');
 
         // Len = 2040
         // Msg = 3A3A819C48EFDE2AD914FBF00E18AB6BC4F14513AB27D0C178A188B61431E7F5623CB66B23346775D386B50E982C493ADBBFC54B9A3CD383382336A1A0B2150A15358F336D03AE18F666C7573D55C4FD181C29E6CCFDE63EA35F0ADF5885CFC0A3D84A2B2E4DD24496DB789E663170CEF74798AA1BBCD4574EA0BBA40489D764B2F83AADC66B148B4A0CD95246C127D5871C4F11418690A5DDF01246A0C80A43C70088B6183639DCFDA4125BD113A8F49EE23ED306FAAC576C3FB0C1E256671D817FC2534A52F5B439F72E424DE376F4C565CCA82307DD9EF76DA5B7C4EB7E085172E328807C02D011FFBF33785378D79DC266F6A5BE6BB0E4A92ECEEBAEB1
-        expect(shake256.arrayBuffer([0x3A,0x3A,0x81,0x9C,0x48,0xEF,0xDE,0x2A,0xD9,0x14,0xFB,0xF0,0x0E,0x18,0xAB,0x6B,0xC4,0xF1,0x45,0x13,0xAB,0x27,0xD0,0xC1,0x78,0xA1,0x88,0xB6,0x14,0x31,0xE7,0xF5,0x62,0x3C,0xB6,0x6B,0x23,0x34,0x67,0x75,0xD3,0x86,0xB5,0x0E,0x98,0x2C,0x49,0x3A,0xDB,0xBF,0xC5,0x4B,0x9A,0x3C,0xD3,0x83,0x38,0x23,0x36,0xA1,0xA0,0xB2,0x15,0x0A,0x15,0x35,0x8F,0x33,0x6D,0x03,0xAE,0x18,0xF6,0x66,0xC7,0x57,0x3D,0x55,0xC4,0xFD,0x18,0x1C,0x29,0xE6,0xCC,0xFD,0xE6,0x3E,0xA3,0x5F,0x0A,0xDF,0x58,0x85,0xCF,0xC0,0xA3,0xD8,0x4A,0x2B,0x2E,0x4D,0xD2,0x44,0x96,0xDB,0x78,0x9E,0x66,0x31,0x70,0xCE,0xF7,0x47,0x98,0xAA,0x1B,0xBC,0xD4,0x57,0x4E,0xA0,0xBB,0xA4,0x04,0x89,0xD7,0x64,0xB2,0xF8,0x3A,0xAD,0xC6,0x6B,0x14,0x8B,0x4A,0x0C,0xD9,0x52,0x46,0xC1,0x27,0xD5,0x87,0x1C,0x4F,0x11,0x41,0x86,0x90,0xA5,0xDD,0xF0,0x12,0x46,0xA0,0xC8,0x0A,0x43,0xC7,0x00,0x88,0xB6,0x18,0x36,0x39,0xDC,0xFD,0xA4,0x12,0x5B,0xD1,0x13,0xA8,0xF4,0x9E,0xE2,0x3E,0xD3,0x06,0xFA,0xAC,0x57,0x6C,0x3F,0xB0,0xC1,0xE2,0x56,0x67,0x1D,0x81,0x7F,0xC2,0x53,0x4A,0x52,0xF5,0xB4,0x39,0xF7,0x2E,0x42,0x4D,0xE3,0x76,0xF4,0xC5,0x65,0xCC,0xA8,0x23,0x07,0xDD,0x9E,0xF7,0x6D,0xA5,0xB7,0xC4,0xEB,0x7E,0x08,0x51,0x72,0xE3,0x28,0x80,0x7C,0x02,0xD0,0x11,0xFF,0xBF,0x33,0x78,0x53,0x78,0xD7,0x9D,0xC2,0x66,0xF6,0xA5,0xBE,0x6B,0xB0,0xE4,0xA9,0x2E,0xCE,0xEB,0xAE,0xB1], 4100).toHexString()).to.be('8a5199b4a7e133e264a86202720655894d48cff344a928cf8347f48379cef347dfc5bcffab99b27b1f89aa2735e23d30088ffa03b9edb02b9635470ab9f1038985d55f9ca774572dd006470ea65145469609f9fa0831bf1ffd842dc24acade27bd9816e3b5bf2876cb112232a0eb4475f1dff9f5c713d9ffd4ccb89ae5607fe35731df06317949eef646e9591cf3be53add6b7dd2b6096e2b3fb06e662ec8b2d77422daad9463cd155204acdbd38e319613f39f99b6dfb35ca9365160066db19835888c2241ff9a731a4acbb5663727aac34a401247fbaa7499e7d5ee5b69d31025e63d04c35c798bca1262d5673a9cf0930b5ad89bd485599dc184528da4790f088ebd170b635d9581632d2ff90db79665ced430089af13c9f21f6d443a818064f17aec9e9c5457001fa8dc6afbadbe3138f388d89d0e6f22f66671255b210754ed63d81dce75ce8f189b534e6d6b3539aa51e837c42df9df59c71e6171cd4902fe1bdc73fb1775b5c754a1ed4ea7f3105fc543ee0418dad256f3f6118ea77114a16c15355b42877a1db2a7df0e155ae1d8670abcec3450f4e2eec9838f895423ef63d261138baaf5d9f104cb5a957aea06c0b9b8c78b0d441796dc0350ddeabb78a33b6f1f9e68ede3d1805c7b7e2cfd54e0fad62f0d8ca67a775dc4546af9096f2edb221db42843d65327861282dc946a0ba01a11863ab2d1dfd16e3973d4');
+        expect(shake256.buffer([0x3A,0x3A,0x81,0x9C,0x48,0xEF,0xDE,0x2A,0xD9,0x14,0xFB,0xF0,0x0E,0x18,0xAB,0x6B,0xC4,0xF1,0x45,0x13,0xAB,0x27,0xD0,0xC1,0x78,0xA1,0x88,0xB6,0x14,0x31,0xE7,0xF5,0x62,0x3C,0xB6,0x6B,0x23,0x34,0x67,0x75,0xD3,0x86,0xB5,0x0E,0x98,0x2C,0x49,0x3A,0xDB,0xBF,0xC5,0x4B,0x9A,0x3C,0xD3,0x83,0x38,0x23,0x36,0xA1,0xA0,0xB2,0x15,0x0A,0x15,0x35,0x8F,0x33,0x6D,0x03,0xAE,0x18,0xF6,0x66,0xC7,0x57,0x3D,0x55,0xC4,0xFD,0x18,0x1C,0x29,0xE6,0xCC,0xFD,0xE6,0x3E,0xA3,0x5F,0x0A,0xDF,0x58,0x85,0xCF,0xC0,0xA3,0xD8,0x4A,0x2B,0x2E,0x4D,0xD2,0x44,0x96,0xDB,0x78,0x9E,0x66,0x31,0x70,0xCE,0xF7,0x47,0x98,0xAA,0x1B,0xBC,0xD4,0x57,0x4E,0xA0,0xBB,0xA4,0x04,0x89,0xD7,0x64,0xB2,0xF8,0x3A,0xAD,0xC6,0x6B,0x14,0x8B,0x4A,0x0C,0xD9,0x52,0x46,0xC1,0x27,0xD5,0x87,0x1C,0x4F,0x11,0x41,0x86,0x90,0xA5,0xDD,0xF0,0x12,0x46,0xA0,0xC8,0x0A,0x43,0xC7,0x00,0x88,0xB6,0x18,0x36,0x39,0xDC,0xFD,0xA4,0x12,0x5B,0xD1,0x13,0xA8,0xF4,0x9E,0xE2,0x3E,0xD3,0x06,0xFA,0xAC,0x57,0x6C,0x3F,0xB0,0xC1,0xE2,0x56,0x67,0x1D,0x81,0x7F,0xC2,0x53,0x4A,0x52,0xF5,0xB4,0x39,0xF7,0x2E,0x42,0x4D,0xE3,0x76,0xF4,0xC5,0x65,0xCC,0xA8,0x23,0x07,0xDD,0x9E,0xF7,0x6D,0xA5,0xB7,0xC4,0xEB,0x7E,0x08,0x51,0x72,0xE3,0x28,0x80,0x7C,0x02,0xD0,0x11,0xFF,0xBF,0x33,0x78,0x53,0x78,0xD7,0x9D,0xC2,0x66,0xF6,0xA5,0xBE,0x6B,0xB0,0xE4,0xA9,0x2E,0xCE,0xEB,0xAE,0xB1], 4100).toHexString()).to.be('8a5199b4a7e133e264a86202720655894d48cff344a928cf8347f48379cef347dfc5bcffab99b27b1f89aa2735e23d30088ffa03b9edb02b9635470ab9f1038985d55f9ca774572dd006470ea65145469609f9fa0831bf1ffd842dc24acade27bd9816e3b5bf2876cb112232a0eb4475f1dff9f5c713d9ffd4ccb89ae5607fe35731df06317949eef646e9591cf3be53add6b7dd2b6096e2b3fb06e662ec8b2d77422daad9463cd155204acdbd38e319613f39f99b6dfb35ca9365160066db19835888c2241ff9a731a4acbb5663727aac34a401247fbaa7499e7d5ee5b69d31025e63d04c35c798bca1262d5673a9cf0930b5ad89bd485599dc184528da4790f088ebd170b635d9581632d2ff90db79665ced430089af13c9f21f6d443a818064f17aec9e9c5457001fa8dc6afbadbe3138f388d89d0e6f22f66671255b210754ed63d81dce75ce8f189b534e6d6b3539aa51e837c42df9df59c71e6171cd4902fe1bdc73fb1775b5c754a1ed4ea7f3105fc543ee0418dad256f3f6118ea77114a16c15355b42877a1db2a7df0e155ae1d8670abcec3450f4e2eec9838f895423ef63d261138baaf5d9f104cb5a957aea06c0b9b8c78b0d441796dc0350ddeabb78a33b6f1f9e68ede3d1805c7b7e2cfd54e0fad62f0d8ca67a775dc4546af9096f2edb221db42843d65327861282dc946a0ba01a11863ab2d1dfd16e3973d4');
       });
     });
 
@@ -104,11 +102,5 @@
         expect(shake256.array([0x3A,0x3A,0x81,0x9C,0x48,0xEF,0xDE,0x2A,0xD9,0x14,0xFB,0xF0,0x0E,0x18,0xAB,0x6B,0xC4,0xF1,0x45,0x13,0xAB,0x27,0xD0,0xC1,0x78,0xA1,0x88,0xB6,0x14,0x31,0xE7,0xF5,0x62,0x3C,0xB6,0x6B,0x23,0x34,0x67,0x75,0xD3,0x86,0xB5,0x0E,0x98,0x2C,0x49,0x3A,0xDB,0xBF,0xC5,0x4B,0x9A,0x3C,0xD3,0x83,0x38,0x23,0x36,0xA1,0xA0,0xB2,0x15,0x0A,0x15,0x35,0x8F,0x33,0x6D,0x03,0xAE,0x18,0xF6,0x66,0xC7,0x57,0x3D,0x55,0xC4,0xFD,0x18,0x1C,0x29,0xE6,0xCC,0xFD,0xE6,0x3E,0xA3,0x5F,0x0A,0xDF,0x58,0x85,0xCF,0xC0,0xA3,0xD8,0x4A,0x2B,0x2E,0x4D,0xD2,0x44,0x96,0xDB,0x78,0x9E,0x66,0x31,0x70,0xCE,0xF7,0x47,0x98,0xAA,0x1B,0xBC,0xD4,0x57,0x4E,0xA0,0xBB,0xA4,0x04,0x89,0xD7,0x64,0xB2,0xF8,0x3A,0xAD,0xC6,0x6B,0x14,0x8B,0x4A,0x0C,0xD9,0x52,0x46,0xC1,0x27,0xD5,0x87,0x1C,0x4F,0x11,0x41,0x86,0x90,0xA5,0xDD,0xF0,0x12,0x46,0xA0,0xC8,0x0A,0x43,0xC7,0x00,0x88,0xB6,0x18,0x36,0x39,0xDC,0xFD,0xA4,0x12,0x5B,0xD1,0x13,0xA8,0xF4,0x9E,0xE2,0x3E,0xD3,0x06,0xFA,0xAC,0x57,0x6C,0x3F,0xB0,0xC1,0xE2,0x56,0x67,0x1D,0x81,0x7F,0xC2,0x53,0x4A,0x52,0xF5,0xB4,0x39,0xF7,0x2E,0x42,0x4D,0xE3,0x76,0xF4,0xC5,0x65,0xCC,0xA8,0x23,0x07,0xDD,0x9E,0xF7,0x6D,0xA5,0xB7,0xC4,0xEB,0x7E,0x08,0x51,0x72,0xE3,0x28,0x80,0x7C,0x02,0xD0,0x11,0xFF,0xBF,0x33,0x78,0x53,0x78,0xD7,0x9D,0xC2,0x66,0xF6,0xA5,0xBE,0x6B,0xB0,0xE4,0xA9,0x2E,0xCE,0xEB,0xAE,0xB1], 4100).toHexString()).to.be('8a5199b4a7e133e264a86202720655894d48cff344a928cf8347f48379cef347dfc5bcffab99b27b1f89aa2735e23d30088ffa03b9edb02b9635470ab9f1038985d55f9ca774572dd006470ea65145469609f9fa0831bf1ffd842dc24acade27bd9816e3b5bf2876cb112232a0eb4475f1dff9f5c713d9ffd4ccb89ae5607fe35731df06317949eef646e9591cf3be53add6b7dd2b6096e2b3fb06e662ec8b2d77422daad9463cd155204acdbd38e319613f39f99b6dfb35ca9365160066db19835888c2241ff9a731a4acbb5663727aac34a401247fbaa7499e7d5ee5b69d31025e63d04c35c798bca1262d5673a9cf0930b5ad89bd485599dc184528da4790f088ebd170b635d9581632d2ff90db79665ced430089af13c9f21f6d443a818064f17aec9e9c5457001fa8dc6afbadbe3138f388d89d0e6f22f66671255b210754ed63d81dce75ce8f189b534e6d6b3539aa51e837c42df9df59c71e6171cd4902fe1bdc73fb1775b5c754a1ed4ea7f3105fc543ee0418dad256f3f6118ea77114a16c15355b42877a1db2a7df0e155ae1d8670abcec3450f4e2eec9838f895423ef63d261138baaf5d9f104cb5a957aea06c0b9b8c78b0d441796dc0350ddeabb78a33b6f1f9e68ede3d1805c7b7e2cfd54e0fad62f0d8ca67a775dc4546af9096f2edb221db42843d65327861282dc946a0ba01a11863ab2d1dfd16e3973d4');
       });
     });
-
-    context('with 1128 output arrayBuffer', function () {
-      it('should be equal', function () {
-        expect(shake256.arrayBuffer('', 1128).toHexString()).to.be('46b9dd2b0ba88d13233b3feb743eeb243fcd52ea62b81b82b50c27646ed5762fd75dc4ddd8c0f200cb05019d67b592f6fc821c49479ab48640292eacb3b7c4be141e96616fb13957692cc7edd0b45ae3dc07223c8e92937bef84bc0eab862853349ec75546f58fb7c2775c38462c5010d846c185c15111e595522a6bcd16cf86f3d122109e3b1fdd943b6aec46');
-      });
-    });
   });
 })(shake256, shake128);

tests/test.js

@@ -9,6 +9,63 @@
     return hex;
   };
 
+  function runTestCases(methods, testCases) {
+    methods.forEach(function (method) {
+      describe('#' + method.name, function () {
+        var methodTestCases = testCases[method.name];
+        for (var testCaseName in methodTestCases) {
+          (function (testCaseName) {
+            var testCase = methodTestCases[testCaseName];
+            context('when ' + testCaseName, function () {
+              for (var hash in testCase) {
+                (function (message, hash) {
+                  it('should be equal', function () {
+                    expect(method.call(message)).to.be(hash);
+                  });
+                })(testCase[hash], hash);
+              }
+            });
+          })(testCaseName);
+        }
+      });
+    });
+  }
+
+  var methods = [
+    {
+      name: 'sha3_512',
+      call: sha3_512
+    },
+    {
+      name: 'sha3_384',
+      call: sha3_384
+    },
+    {
+      name: 'sha3_256',
+      call: sha3_256
+    },
+    {
+      name: 'sha3_224',
+      call: sha3_224
+    },
+    {
+      name: 'keccak512',
+      call: keccak512
+    },
+    {
+      name: 'keccak384',
+      call: keccak384
+    },
+    {
+      name: 'keccak256',
+      call: keccak256
+    },
+    {
+      name: 'keccak224',
+      call: keccak224
+    }
+  ];
+
   var testCases = {
     sha3_512: {
       'ascii': {
@@ -35,6 +92,14 @@
       'Array': {
         'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26': [],
         '01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450': [84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103]
+      },
+      'Uint8Array': {
+        'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26': new Uint8Array([]),
+        '01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450': new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103])
+      },
+      'ArrayBuffer': {
+        'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26': new ArrayBuffer(0),
+        '01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450': new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103]).buffer
       }
     },
     sha3_384: {
@@ -172,202 +237,104 @@
     }
   };
 
-  if (!(typeof JS_SHA3_NO_ARRAY_BUFFER === 'boolean' && JS_SHA3_NO_ARRAY_BUFFER)) {
+  runTestCases(methods, testCases);
-    testCases.sha3_512.Uint8Array = {
-      'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26': new Uint8Array([]),
-      '01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450': new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103])
-    };
-    testCases.sha3_512.ArrayBuffer = {
-      'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26': new ArrayBuffer(0),
-      '01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450': new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103]).buffer
-    };
-  }
 
-  if (typeof BUFFER === 'boolean' && BUFFER) {
+  describe('sha3_512', function () {
-    testCases.sha3_512.Buffer = {
+    context('#arrayBuffer', function () {
-      'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26': Buffer.from([]),
+      it('should be equal', function () {
-      '01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450': Buffer.from(new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103]))
+        expect(sha3_512.arrayBuffer('').toHexString()).to.be('a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26');
-    };
+        expect(sha3_512.buffer('').toHexString()).to.be('a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26');
-  }
+      });
+    });
 
-  var errorTestCases = [null, undefined, { length: 0 }, 0, 1, false, true, NaN, Infinity, function () {}];
+    context('#hex', function () {
+      it('should be equal', function () {
+        expect(sha3_512.hex('')).to.be('a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26');
+      });
+    });
 
-  function runTestCases(name, algorithm) {
+    context('#update', function () {
-    var methods = [
+      it('should be equal', function () {
-      {
+        expect(sha3_512.update('').hex()).to.be('a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26');
-        name: name,
+        expect(sha3_512.update('The quick brown fox ').update('jumps over the lazy dog').hex()).to.be('01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450');
-        call: algorithm,
+      });
-      },
+    });
-      {
-        name: name + '.hex',
-        call: algorithm.hex
-      },
-      {
-        name: name + '.array',
-        call: function (message) {
-          return algorithm.array(message).toHexString();
-        }
-      },
-      {
-        name: name + '.digest',
-        call: function (message) {
-          return algorithm.digest(message).toHexString();
-        }
-      },
-      {
-        name: name + '.arrayBuffer',
-        call: function (message) {
-          return algorithm.arrayBuffer(message).toHexString();
-        }
-      }
-    ];
 
-    var classMethods = [
+    context('#create', function () {
-      {
+      it('should be equal', function () {
-        name: 'create',
+        var bytes = [84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103];
-        call: function (message) {
+        var hash = sha3_512.create();
-          return algorithm.create().update(message).toString();
+        for (var i = 0; i < bytes.length; ++i) {
-        }
+          hash.update([bytes[i]]);
-      },
-      {
-        name: 'update',
-        call: function (message) {
-          return algorithm.update(message).toString();
-        }
-      },
-      {
-        name: 'hex',
-        call: function (message) {
-          return algorithm.update(message).hex();
-        }
-      },
-      {
-        name: 'array',
-        call: function (message) {
-          return algorithm.update(message).array().toHexString();
-        }
-      },
-      {
-        name: 'digest',
-        call: function (message) {
-          return algorithm.update(message).digest().toHexString();
-        }
-      },
-      {
-        name: 'arrayBuffer',
-        call: function (message) {
-          return algorithm.update(message).arrayBuffer().toHexString();
-        }
-      },
-      {
-        name: 'finalize',
-        call: function (message) {
-          var hash = algorithm.update(message);
-          hash.hex();
-          hash.finalize();
-          return hash.hex();
-        }
         }
-    ];
+        expect(hash.hex()).to.be('01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450');
-
+      });
-    var subTestCases = testCases[name];
+    });
+  });
 
-    describe(name, function () {
+  describe('#keccak512', function () {
-      methods.forEach(function (method) {
+    context('when special length', function () {
-        describe('#' + method.name, function () {
-          for (var testCaseName in subTestCases) {
-            (function (testCaseName) {
-              var testCase = subTestCases[testCaseName];
-              context('when ' + testCaseName, function () {
-                for (var hash in testCase) {
-                  (function (message, hash) {
       it('should be equal', function () {
-                      expect(method.call(message)).to.be(hash);
+        expect(keccak512('012345678901234567890123456789012345678901234567890123456789012345678901')).to.be('90b1d032c3bf06dcc78a46fe52054bab1250600224bfc6dfbfb40a7877c55e89bb982799a2edf198568a4166f6736678b45e76b12fac813cfdf0a76714e5eae8');
+        expect(keccak512('01234567890123456789012345678901234567890123456789012345678901234567890')).to.be('3173e7abc754a0b2909410d78986428a9183e996864af02f421d273d9fa1b4e4a5b14e2998b20767712f53a01ff8f6ae2c3e71e51e2c0f24257b03e6da09eb77');
       });
-                  })(testCase[hash], hash);
-                }
     });
-            })(testCaseName);
+
-          }
+    context('when Array', function () {
+      it('should be equal', function () {
+        expect(keccak512([])).to.be('0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e');
+        expect(keccak512([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103])).to.be('d135bb84d0439dbac432247ee573a23ea7d3c9deb2a968eb31d47c4fb45f1ef4422d6c531b5b9bd6f449ebcc449ea94d0a8f05f62130fda612da53c79659f609');
       });
     });
 
-      classMethods.forEach(function (method) {
+    context('when Uint8Array', function () {
-        describe('#' + method.name, function () {
-          for (var testCaseName in subTestCases) {
-            (function (testCaseName) {
-              var testCase = subTestCases[testCaseName];
-              context('when ' + testCaseName, function () {
-                for (var hash in testCase) {
-                  (function (message, hash) {
       it('should be equal', function () {
-                      expect(method.call(message)).to.be(hash);
+        expect(keccak512(new Uint8Array([]))).to.be('0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e');
+        expect(keccak512(new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103]))).to.be('d135bb84d0439dbac432247ee573a23ea7d3c9deb2a968eb31d47c4fb45f1ef4422d6c531b5b9bd6f449ebcc449ea94d0a8f05f62130fda612da53c79659f609');
       });
-                  })(testCase[hash], hash);
-                }
     });
-            })(testCaseName);
+
-          }
+    context('when ArrayBuffer', function () {
+      it('should be equal', function () {
+        expect(keccak512(new ArrayBuffer(0))).to.be('0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e');
       });
     });
 
-      describe('#' + name, function () {
+    context('when output ArrayBuffer', function () {
-        errorTestCases.forEach(function (testCase) {
+      it('should be equal', function () {
-          context('when ' + testCase, function () {
+        expect(keccak512.arrayBuffer('').toHexString()).to.be('0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e');
-            it('should throw error', function () {
+        expect(keccak512.buffer('').toHexString()).to.be('0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e');
-              expect(function () {
-                algorithm(testCase);
-              }).to.throwError(/input is invalid type/);
       });
     });
+
+    context('when output Array', function () {
+      it('should be equal', function () {
+        expect(keccak512.array('').toHexString()).to.be('0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e');
+      });
     });
 
-        context('when update after finalize', function () {
+    context('when incorrect input', function () {
       it('should throw error', function () {
         expect(function () {
-              var hash = algorithm.update('any');
+          keccak512(1);
-              hash.hex();
+        }).to.throwError();
-              hash.update('any');
-            }).to.throwError(/finalize already called/);
-          });
-        });
       });
     });
-  }
-
-  runTestCases('sha3_512', sha3_512);
-  runTestCases('sha3_384', sha3_384);
-  runTestCases('sha3_256', sha3_256);
-  runTestCases('sha3_224', sha3_224);
-  runTestCases('keccak512', keccak512);
-  runTestCases('keccak384', keccak384);
-  runTestCases('keccak256', keccak256);
-  runTestCases('keccak224', keccak224);
 
-  describe('#keccak512', function () {
     context('#encodeString', function () {
-      errorTestCases.forEach(function (testCase) {
+      context('when incorrect input', function () {
-        context('when ' + testCase, function () {
         it('should throw error', function () {
           expect(function () {
-              keccak512.create().encodeString(testCase);
+            keccak512.create().encodeString(1);
-            }).to.throwError(/input is invalid type/);
+          }).to.throwError();
-          });
         });
       });
 
-      if (!(typeof JS_SHA3_NO_ARRAY_BUFFER === 'boolean' && JS_SHA3_NO_ARRAY_BUFFER)) {
       context('when ArrayBuffer', function () {
         it('should throw error', function () {
           expect(keccak512.create().encodeString(new ArrayBuffer(0))).to.be(2);
         });
       });
-        context('when Uint8Array', function () {
-          it('should throw error', function () {
-            expect(keccak512.create().encodeString(new Uint8Array(0))).to.be(2);
-          });
-        });
-      }
 
       context('when UTF-8', function () {
         it('should throw error', function () {

tests/worker-test.js

@@ -1,24 +0,0 @@
-(function (Worker, WORKER, SOURCE) {
-  var cases = {
-    'a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26': '',
-    '01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450': 'The quick brown fox jumps over the lazy dog',
-    '18f4f4bd419603f95538837003d9d254c26c23765565162247483f65c50303597bc9ce4d289f21d1c2f1f458828e33dc442100331b35e7eb031b5d38ba6460f8': 'The quick brown fox jumps over the lazy dog.'
-  };
-
-  describe('#sha3_512', function () {
-    Object.keys(cases).forEach(function (hash) {
-      it('should be equal', function (done) {
-        var worker = new Worker(WORKER);
-        worker.onmessage = function(event) {
-          expect(event.data).to.be(hash);
-          if (worker.terminate) {
-            worker.terminate();
-          }
-          done();
-        };
-        worker.postMessage(SOURCE);
-        worker.postMessage(cases[hash]);
-      });
-    });
-  });
-})(Worker, WORKER, SOURCE);

tests/worker.html

@@ -1,26 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>SHA3</title>
-  <link rel="stylesheet" href="../node_modules/mocha/mocha.css">
-  <script src="../node_modules/mocha/mocha.js"></script>
-  <script src="../node_modules/expect.js/index.js"></script>
-  <script src="../src/sha3.js"></script>
-</head>
-<body>
-  <div id="mocha"></div>
-  <script>
-    WORKER = 'worker.js';
-    SOURCE = '../src/sha3.js';
-    mocha.setup('bdd');
-  </script>
-  <script src="worker-test.js"></script>
-  <script>
-    mocha.checkLeaks();
-    mocha.run();
-  </script>
-  <script>
-  </script>
-</body>
-</html>

tests/worker.js

@@ -1,12 +0,0 @@
-var imported = false;
-onmessage = function(e) {
-  if (imported) {
-    postMessage(sha3_512(e.data));
-    if (typeof exports !== 'undefined') {
-      imported = false;
-    }
-  } else {
-    imported = true;
-    importScripts(e.data);
-  }
-}