## v0.9.1 / 2023-08-31

### Fixed
- cSHAKE empty Array bug. #24

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 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.

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2015-2018 Chen, Yi-Cyuan
+Copyright 2015-2023 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

@@ -84,26 +84,46 @@ 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
-sha3_512 = require('js-sha3').sha3_512;
+const {
-sha3_384 = require('js-sha3').sha3_384;
+  sha3_512,
-sha3_256 = require('js-sha3').sha3_256;
+  sha3_384,
-sha3_224 = require('js-sha3').sha3_224;
+  sha3_256,
-keccak512 = require('js-sha3').keccak512;
+  sha3_224,
-keccak384 = require('js-sha3').keccak384;
+  keccak512,
-keccak256 = require('js-sha3').keccak256;
+  keccak384,
-keccak224 = require('js-sha3').keccak224;
+  keccak256,
-shake128 = require('js-sha3').shake128;
+  keccak224,
-shake256 = require('js-sha3').shake256;
+  shake128,
-cshake128 = require('js-sha3').cshake128;
+  shake256,
-cshake256 = require('js-sha3').cshake256;
+  cshake128,
-kmac128 = require('js-sha3').kmac128;
+  cshake256,
-kmac256 = require('js-sha3').kmac256;
+  kmac128,
+  kmac25
+} = require('js-sha3');
 ```
+
+### TypeScript
 If you use TypeScript, you can import like this:
 ```TypeScript
-import { sha3_512 } from 'js-sha3';
+import {
+  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.8.0",
+  "version": "0.9.1",
   "main": ["src/sha3.js"],
   "ignore": [
     "samples",

package.json

@@ -1,14 +1,14 @@
 {
   "name": "js-sha3",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "A simple SHA-3 / Keccak / Shake hash function for JavaScript supports UTF-8 encoding.",
   "main": "src/sha3.js",
   "devDependencies": {
     "expect.js": "~0.3.1",
-    "mocha": "~2.3.4",
+    "mocha": "~10.2.0",
-    "nyc": "^11.3.0",
+    "nyc": "^15.1.0",
-    "uglify-js": "^3.1.9",
+    "tiny-worker": "^2.3.0",
-    "webworker-threads": "^0.7.13"
+    "uglify-js": "^3.1.9"
   },
   "scripts": {
     "test": "nyc mocha tests/node-test.js",

src/sha3.js

@@ -1,9 +1,9 @@
 /**
  * [js-sha3]{@link https://github.com/emn178/js-sha3}
  *
- * @version 0.8.0
+ * @version 0.9.1
  * @author Chen, Yi-Cyuan [emn178@gmail.com]
- * @copyright Chen, Yi-Cyuan 2015-2018
+ * @copyright Chen, Yi-Cyuan 2015-2023
  * @license MIT
  */
 /*jslint bitwise: true */
@@ -58,6 +58,31 @@
     };
   }
 
+  var formatMessage = function (message) {
+    var notString, type = typeof message;
+    if (type !== 'string') {
+      if (type === 'object') {
+        if (message === null) {
+          throw new Error(INPUT_ERROR);
+        } else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
+          message = new Uint8Array(message);
+        } else if (!Array.isArray(message)) {
+          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
+            throw new Error(INPUT_ERROR);
+          }
+        }
+      } else {
+        throw new Error(INPUT_ERROR);
+      }
+      notString = true;
+    }
+    return [message, notString];
+  }
+
+  var empty = function (message) {
+    return formatMessage(message)[0].length === 0;
+  };
+
   var createOutputMethod = function (bits, padding, outputType) {
     return function (message) {
       return new Keccak(bits, padding, bits).update(message)[outputType]();
@@ -116,7 +141,7 @@
     var w = CSHAKE_BYTEPAD[bits];
     var method = createCshakeOutputMethod(bits, padding, 'hex');
     method.create = function (outputBits, n, s) {
-      if (!n && !s) {
+      if (empty(n) && empty(s)) {
         return methods['shake' + bits].create(outputBits);
       } else {
         return new Keccak(bits, padding, outputBits).bytepad([n, s], w);
@@ -188,23 +213,9 @@
     if (this.finalized) {
       throw new Error(FINALIZE_ERROR);
     }
-    var notString, type = typeof message;
+    var result = formatMessage(message);
-    if (type !== 'string') {
+    message = result[0];
-      if (type === 'object') {
+    var notString = result[1];
-        if (message === null) {
-          throw new Error(INPUT_ERROR);
-        } else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
-          message = new Uint8Array(message);
-        } else if (!Array.isArray(message)) {
-          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
-            throw new Error(INPUT_ERROR);
-          }
-        }
-      } else {
-        throw new Error(INPUT_ERROR);
-      }
-      notString = true;
-    }
     var blocks = this.blocks, byteCount = this.byteCount, length = message.length,
       blockCount = this.blockCount, index = 0, s = this.s, i, code;
 
@@ -278,23 +289,9 @@
   };
 
   Keccak.prototype.encodeString = function (str) {
-    var notString, type = typeof str;
+    var result = formatMessage(str);
-    if (type !== 'string') {
+    str = result[0];
-      if (type === 'object') {
+    var notString = result[1];
-        if (str === null) {
-          throw new Error(INPUT_ERROR);
-        } else if (ARRAY_BUFFER && str.constructor === ArrayBuffer) {
-          str = new Uint8Array(str);
-        } else if (!Array.isArray(str)) {
-          if (!ARRAY_BUFFER || !ArrayBuffer.isView(str)) {
-            throw new Error(INPUT_ERROR);
-          }
-        }
-      } else {
-        throw new Error(INPUT_ERROR);
-      }
-      notString = true;
-    }
     var bytes = 0, length = str.length;
     if (notString) {
       bytes = length;
@@ -323,7 +320,7 @@
     for (var i = 0; i < strs.length; ++i) {
       bytes += this.encodeString(strs[i]);
     }
-    var paddingBytes = w - bytes % w;
+    var paddingBytes = (w - bytes % w) % w;
     var zeros = [];
     zeros.length = paddingBytes;
     this.update(zeros);

tests/node-test.js

@@ -1,5 +1,5 @@
 expect = require('expect.js');
-Worker = require('webworker-threads').Worker;
+Worker = require("tiny-worker");
 
 function unset() {
   delete require.cache[require.resolve('../src/sha3.js')];

tests/test-cshake.js

@@ -25,6 +25,27 @@
           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,6 +94,13 @@
           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'
         }
       ]
     }
@@ -106,6 +113,6 @@
           expect(testCase.method(c.key, c.input, c.bits, c.s)).to.be(c.output);
         });
       });
-    });    
+    });
   });
 })(kmac256, kmac128);

tests/worker-test.js

@@ -11,6 +11,9 @@
         var worker = new Worker(WORKER);
         worker.onmessage = function(event) {
           expect(event.data).to.be(hash);
+          if (worker.terminate) {
+            worker.terminate();
+          }
           done();
         };
         worker.postMessage(SOURCE);