Browse Source

Updated dependencies. Removed shim from HMAC op and postinstall js-to-mjs step due to CryptoAPI fixes.

n1474335 6 years ago
parent
commit
18a9dfffc7
3 changed files with 277 additions and 335 deletions
  1. 257 306
      package-lock.json
  2. 20 22
      package.json
  3. 0 7
      src/core/operations/HMAC.mjs

File diff suppressed because it is too large
+ 257 - 306
package-lock.json


+ 20 - 22
package.json

@@ -30,14 +30,14 @@
   "main": "build/node/CyberChef.js",
   "main": "build/node/CyberChef.js",
   "bugs": "https://github.com/gchq/CyberChef/issues",
   "bugs": "https://github.com/gchq/CyberChef/issues",
   "devDependencies": {
   "devDependencies": {
-    "@babel/core": "^7.1.2",
-    "@babel/preset-env": "^7.1.0",
-    "autoprefixer": "^9.1.5",
+    "@babel/core": "^7.1.5",
+    "@babel/preset-env": "^7.1.5",
+    "autoprefixer": "^9.3.1",
     "babel-loader": "^8.0.4",
     "babel-loader": "^8.0.4",
     "bootstrap": "^4.1.3",
     "bootstrap": "^4.1.3",
     "colors": "^1.3.2",
     "colors": "^1.3.2",
-    "css-loader": "^1.0.0",
-    "eslint": "^5.6.1",
+    "css-loader": "^1.0.1",
+    "eslint": "^5.8.0",
     "exports-loader": "^0.7.0",
     "exports-loader": "^0.7.0",
     "extract-text-webpack-plugin": "^4.0.0-alpha0",
     "extract-text-webpack-plugin": "^4.0.0-alpha0",
     "file-loader": "^2.0.0",
     "file-loader": "^2.0.0",
@@ -55,20 +55,19 @@
     "html-webpack-plugin": "^3.2.0",
     "html-webpack-plugin": "^3.2.0",
     "imports-loader": "^0.8.0",
     "imports-loader": "^0.8.0",
     "ink-docstrap": "^1.3.2",
     "ink-docstrap": "^1.3.2",
-    "js-to-mjs": "^0.2.0",
     "jsdoc-babel": "^0.5.0",
     "jsdoc-babel": "^0.5.0",
-    "node-sass": "^4.9.3",
+    "node-sass": "^4.10.0",
     "postcss-css-variables": "^0.11.0",
     "postcss-css-variables": "^0.11.0",
-    "postcss-import": "^12.0.0",
+    "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "postcss-loader": "^3.0.0",
     "prompt": "^1.0.0",
     "prompt": "^1.0.0",
     "sass-loader": "^7.1.0",
     "sass-loader": "^7.1.0",
-    "sitemap": "^2.0.1",
+    "sitemap": "^2.1.0",
     "style-loader": "^0.23.1",
     "style-loader": "^0.23.1",
     "url-loader": "^1.1.2",
     "url-loader": "^1.1.2",
     "web-resource-inliner": "^4.2.1",
     "web-resource-inliner": "^4.2.1",
-    "webpack": "^4.20.2",
-    "webpack-dev-server": "^3.1.9",
+    "webpack": "^4.25.1",
+    "webpack-dev-server": "^3.1.10",
     "webpack-node-externals": "^1.7.2",
     "webpack-node-externals": "^1.7.2",
     "worker-loader": "^2.0.0"
     "worker-loader": "^2.0.0"
   },
   },
@@ -77,22 +76,22 @@
     "babel-plugin-transform-builtin-extend": "1.1.2",
     "babel-plugin-transform-builtin-extend": "1.1.2",
     "babel-polyfill": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "bcryptjs": "^2.4.3",
     "bcryptjs": "^2.4.3",
-    "bignumber.js": "^7.2.1",
+    "bignumber.js": "^8.0.1",
     "bootstrap-colorpicker": "^2.5.3",
     "bootstrap-colorpicker": "^2.5.3",
     "bootstrap-material-design": "^4.1.1",
     "bootstrap-material-design": "^4.1.1",
     "bson": "^3.0.2",
     "bson": "^3.0.2",
     "chi-squared": "^1.1.0",
     "chi-squared": "^1.1.0",
-    "crypto-api": "^0.8.0",
+    "crypto-api": "^0.8.3",
     "crypto-js": "^3.1.9-1",
     "crypto-js": "^3.1.9-1",
     "ctph.js": "0.0.5",
     "ctph.js": "0.0.5",
     "diff": "^3.5.0",
     "diff": "^3.5.0",
-    "es6-promisify": "^6.0.0",
+    "es6-promisify": "^6.0.1",
     "escodegen": "^1.11.0",
     "escodegen": "^1.11.0",
     "esmangle": "^1.0.1",
     "esmangle": "^1.0.1",
     "esprima": "^4.0.1",
     "esprima": "^4.0.1",
     "exif-parser": "^0.1.12",
     "exif-parser": "^0.1.12",
-    "file-saver": "^2.0.0-rc.3",
-    "highlight.js": "^9.12.0",
+    "file-saver": "^2.0.0-rc.4",
+    "highlight.js": "^9.13.1",
     "jquery": "^3.3.1",
     "jquery": "^3.3.1",
     "js-crc": "^0.2.0",
     "js-crc": "^0.2.0",
     "js-sha3": "^0.8.0",
     "js-sha3": "^0.8.0",
@@ -101,12 +100,12 @@
     "jsonpath": "^1.0.0",
     "jsonpath": "^1.0.0",
     "jsonwebtoken": "^8.3.0",
     "jsonwebtoken": "^8.3.0",
     "jsrsasign": "8.0.12",
     "jsrsasign": "8.0.12",
-    "kbpgp": "^2.0.80",
+    "kbpgp": "^2.0.82",
     "lodash": "^4.17.11",
     "lodash": "^4.17.11",
     "loglevel": "^1.6.1",
     "loglevel": "^1.6.1",
     "loglevel-message-prefix": "^3.0.0",
     "loglevel-message-prefix": "^3.0.0",
     "moment": "^2.22.2",
     "moment": "^2.22.2",
-    "moment-timezone": "^0.5.21",
+    "moment-timezone": "^0.5.23",
     "ngeohash": "^0.6.0",
     "ngeohash": "^0.6.0",
     "node-forge": "^0.7.6",
     "node-forge": "^0.7.6",
     "node-md6": "^0.1.0",
     "node-md6": "^0.1.0",
@@ -117,9 +116,9 @@
     "scryptsy": "^2.0.0",
     "scryptsy": "^2.0.0",
     "snackbarjs": "^1.1.0",
     "snackbarjs": "^1.1.0",
     "sortablejs": "^1.7.0",
     "sortablejs": "^1.7.0",
-    "split.js": "^1.5.2",
+    "split.js": "^1.5.9",
     "ssdeep.js": "0.0.2",
     "ssdeep.js": "0.0.2",
-    "ua-parser-js": "^0.7.18",
+    "ua-parser-js": "^0.7.19",
     "utf8": "^3.0.0",
     "utf8": "^3.0.0",
     "vkbeautify": "^0.99.3",
     "vkbeautify": "^0.99.3",
     "xmldom": "^0.1.27",
     "xmldom": "^0.1.27",
@@ -133,7 +132,6 @@
     "test": "grunt test",
     "test": "grunt test",
     "docs": "grunt docs",
     "docs": "grunt docs",
     "lint": "grunt lint",
     "lint": "grunt lint",
-    "newop": "node --experimental-modules src/core/config/scripts/newOperation.mjs",
-    "postinstall": "[ -f node_modules/crypto-api/src/crypto-api.mjs ] || npx j2m node_modules/crypto-api/src/crypto-api.js"
+    "newop": "node --experimental-modules src/core/config/scripts/newOperation.mjs"
   }
   }
 }
 }

+ 0 - 7
src/core/operations/HMAC.mjs

@@ -71,13 +71,6 @@ class HMAC extends Operation {
             msg = Utils.arrayBufferToStr(input, false),
             msg = Utils.arrayBufferToStr(input, false),
             hasher = CryptoApi.getHasher(hashFunc);
             hasher = CryptoApi.getHasher(hashFunc);
 
 
-        // Horrible shim to fix constructor bug. Reported in nf404/crypto-api#8
-        hasher.reset = () => {
-            hasher.state = {};
-            const tmp = new hasher.constructor();
-            hasher.state = tmp.state;
-        };
-
         const mac = CryptoApi.getHmac(CryptoApi.encoder.fromUtf(key), hasher);
         const mac = CryptoApi.getHmac(CryptoApi.encoder.fromUtf(key), hasher);
         mac.update(msg);
         mac.update(msg);
         return CryptoApi.encoder.toHex(mac.finalize());
         return CryptoApi.encoder.toHex(mac.finalize());

Some files were not shown because too many files changed in this diff