From e2a35ea844cd4535e59be11474acb6a90d5e8d06 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 22 Sep 2017 17:01:39 +0000
Subject: [PATCH] Updated Whirlpool and HAS-160 operations to work with modules

---
 package.json                       | 4 ++--
 src/core/config/OperationConfig.js | 4 ++--
 src/core/config/modules/Hashing.js | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index c8cf6644..6aef966f 100644
--- a/package.json
+++ b/package.json
@@ -61,8 +61,8 @@
     "url-loader": "^0.5.9",
     "val-loader": "^1.0.2",
     "web-resource-inliner": "^4.1.1",
-    "webpack": "^3.5.6",
-    "webpack-dev-server": "^2.5.0",
+    "webpack": "^3.6.0",
+    "webpack-dev-server": "^2.8.2",
     "webpack-node-externals": "^1.6.0",
     "worker-loader": "^0.8.0"
   },
diff --git a/src/core/config/OperationConfig.js b/src/core/config/OperationConfig.js
index 2453c95b..5e1aae87 100755
--- a/src/core/config/OperationConfig.js
+++ b/src/core/config/OperationConfig.js
@@ -2992,15 +2992,15 @@ const OperationConfig = {
         ]
     },
     "HAS-160": {
+        module: "Hashing",
         description: "HAS-160 is a cryptographic hash function designed for use with the Korean KCDSA digital signature algorithm. It is derived from SHA-1, with assorted changes intended to increase its security. It produces a 160-bit output.<br><br>HAS-160 is used in the same way as SHA-1. First it divides input in blocks of 512 bits each and pads the final block. A digest function updates the intermediate hash value by processing the input blocks in turn.<br><br>The message digest algorithm consists of 80 rounds.",
-        run: Hash.runHAS,
         inputType: "string",
         outputType: "string",
         args: []
     },
     "Whirlpool": {
+        module: "Hashing",
         description: "Whirlpool is a cryptographic hash function designed by Vincent Rijmen (co-creator of AES) and Paulo S. L. M. Barreto, who first described it in 2000.<br><br>Several variants exist:<ul><li>Whirlpool-0 is the original version released in 2000.</li><li>Whirlpool-T is the first revision, released in 2001, improving the generation of the s-box.</li><li>Wirlpool is the latest revision, released in 2003, fixing a flaw in the difusion matrix.</li></ul>",
-        run: Hash.runWhirlpool,
         inputType: "string",
         outputType: "string",
         args: [
diff --git a/src/core/config/modules/Hashing.js b/src/core/config/modules/Hashing.js
index a04b87e3..235a9cfe 100644
--- a/src/core/config/modules/Hashing.js
+++ b/src/core/config/modules/Hashing.js
@@ -31,6 +31,8 @@ OpModules.Hashing = {
     "Keccak":               Hash.runKeccak,
     "Shake":                Hash.runShake,
     "RIPEMD":               Hash.runRIPEMD,
+    "HAS-160":              Hash.runHAS,
+    "Whirlpool":            Hash.runWhirlpool,
     "HMAC":                 Hash.runHMAC,
     "Fletcher-8 Checksum":  Checksum.runFletcher8,
     "Fletcher-16 Checksum": Checksum.runFletcher16,