From 7a5225c961a5e0d192b03152117cd10a761f73d6 Mon Sep 17 00:00:00 2001 From: n1474335 Date: Wed, 14 Aug 2024 15:21:57 +0100 Subject: [PATCH 1/4] Fixed JA4 version fallback value --- src/core/lib/JA4.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/lib/JA4.mjs b/src/core/lib/JA4.mjs index 5e606f46b6..f600f4d893 100644 --- a/src/core/lib/JA4.mjs +++ b/src/core/lib/JA4.mjs @@ -44,7 +44,7 @@ export function toJA4(bytes) { the TLS version is the value of the Protocol Version. Handshake version (located at the top of the packet) should be ignored. */ - let version = tlsr.version.value; + let version = tlsr.handshake.value.helloVersion.value; for (const ext of tlsr.handshake.value.extensions.value) { if (ext.type.value === "supported_versions") { version = parseHighestSupportedVersion(ext.value.data); @@ -189,7 +189,7 @@ export function toJA4S(bytes) { the TLS version is the value of the Protocol Version. Handshake version (located at the top of the packet) should be ignored. */ - let version = tlsr.version.value; + let version = tlsr.handshake.value.helloVersion.value; for (const ext of tlsr.handshake.value.extensions.value) { if (ext.type.value === "supported_versions") { version = parseHighestSupportedVersion(ext.value.data); From 5f88ae44ec77228d9bed8f11e8cc8e7dcfb36914 Mon Sep 17 00:00:00 2001 From: n1474335 Date: Wed, 14 Aug 2024 15:22:06 +0100 Subject: [PATCH 2/4] 10.19.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a006a85367..3d098c7c54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cyberchef", - "version": "10.19.0", + "version": "10.19.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cyberchef", - "version": "10.19.0", + "version": "10.19.1", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 710a42e0ba..e458bd9b3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cyberchef", - "version": "10.19.0", + "version": "10.19.1", "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.", "author": "n1474335 ", "homepage": "https://gchq.github.io/CyberChef", From 0e82e4b7c6c77cadb8be61cb145e081d6ecfdc88 Mon Sep 17 00:00:00 2001 From: n1474335 Date: Wed, 14 Aug 2024 15:35:12 +0100 Subject: [PATCH 3/4] Updated chromedriver --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3d098c7c54..aa018e1ca0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,7 +115,7 @@ "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-transform-builtin-extend": "1.1.2", "base64-loader": "^1.0.0", - "chromedriver": "^125.0.3", + "chromedriver": "^127.0.2", "cli-progress": "^3.12.0", "colors": "^1.4.0", "copy-webpack-plugin": "^12.0.2", @@ -5093,9 +5093,9 @@ } }, "node_modules/chromedriver": { - "version": "125.0.3", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-125.0.3.tgz", - "integrity": "sha512-Qzuk5Wian2o3EVGjtbz6V/jv+pT/AV9246HbG6kUljZXXjsKZLZxqJC+kHR3qEh/wdv4EJD0YwAOWV72v9hogw==", + "version": "127.0.2", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-127.0.2.tgz", + "integrity": "sha512-mYfJ/8FqzsdFOs2rPiAI4y0suFnv78cRnzZK0MHdSfSIDeRPbqZz0rNX4lrXt14hXc9vqXa+a8cMxlrhWtXKSQ==", "dev": true, "hasInstallScript": true, "dependencies": { diff --git a/package.json b/package.json index e458bd9b3d..bde3df48a4 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-transform-builtin-extend": "1.1.2", "base64-loader": "^1.0.0", - "chromedriver": "^125.0.3", + "chromedriver": "^127.0.2", "cli-progress": "^3.12.0", "colors": "^1.4.0", "copy-webpack-plugin": "^12.0.2", From d635cca2106aae2a59caf0e5d7e3633ee1ea3155 Mon Sep 17 00:00:00 2001 From: n1474335 Date: Wed, 14 Aug 2024 15:35:17 +0100 Subject: [PATCH 4/4] 10.19.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa018e1ca0..3904f84080 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cyberchef", - "version": "10.19.1", + "version": "10.19.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cyberchef", - "version": "10.19.1", + "version": "10.19.2", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index bde3df48a4..cc3517d356 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cyberchef", - "version": "10.19.1", + "version": "10.19.2", "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.", "author": "n1474335 ", "homepage": "https://gchq.github.io/CyberChef",