Skip to content

Commit b118932

Browse files
authored
Merge branch 'master' into base92
2 parents 5f0f037 + fd77152 commit b118932

36 files changed

+1332
-105
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ npm-debug.log
33
travis.log
44
build
55
.vscode
6+
.idea
67
.*.swp
78
src/core/config/modules/*
89
src/core/config/OperationConfig.json

CHANGELOG.md

+20-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ All major and minor version changes will be documented in this file. Details of
1313

1414
## Details
1515

16+
### [10.6.0] - 2024-02-03
17+
- Updated 'Forensics Wiki' URLs to new domain [@a3957273] | [#1703]
18+
- Added 'LZNT1 Decompress' operation [@0xThiebaut] | [#1675]
19+
- Updated 'Regex Expression' UUID matcher [@cnotin] | [#1678]
20+
- Removed duplicate 'hover' message within baking info [@KevinSJ] | [#1541]
21+
22+
### [10.5.0] - 2023-07-14
23+
- Added GOST Encrypt, Decrypt, Sign, Verify, Key Wrap, and Key Unwrap operations [@n1474335] | [#592]
24+
1625
### [10.4.0] - 2023-03-24
1726
- Added 'Generate De Bruijn Sequence' operation [@gchq77703] | [#493]
1827

@@ -370,7 +379,8 @@ All major and minor version changes will be documented in this file. Details of
370379
- Initial open source commit [@n1474335] | [b1d73a72](https://github.com/gchq/CyberChef/commit/b1d73a725dc7ab9fb7eb789296efd2b7e4b08306)
371380

372381

373-
382+
[10.6.0]: https://github.com/gchq/CyberChef/releases/tag/v10.6.0
383+
[10.5.0]: https://github.com/gchq/CyberChef/releases/tag/v10.5.0
374384
[10.4.0]: https://github.com/gchq/CyberChef/releases/tag/v10.4.0
375385
[10.3.0]: https://github.com/gchq/CyberChef/releases/tag/v10.3.0
376386
[10.2.0]: https://github.com/gchq/CyberChef/releases/tag/v10.2.0
@@ -524,6 +534,10 @@ All major and minor version changes will be documented in this file. Details of
524534
[@joostrijneveld]: https://github.com/joostrijneveld
525535
[@Xenonym]: https://github.com/Xenonym
526536
[@gchq77703]: https://github.com/gchq77703
537+
[@a3957273]: https://github.com/a3957273
538+
[@0xThiebaut]: https://github.com/0xThiebaut
539+
[@cnotin]: https://github.com/cnotin
540+
[@KevinSJ]: https://github.com/KevinSJ
527541

528542
[8ad18b]: https://github.com/gchq/CyberChef/commit/8ad18bc7db6d9ff184ba3518686293a7685bf7b7
529543
[9a33498]: https://github.com/gchq/CyberChef/commit/9a33498fed26a8df9c9f35f39a78a174bf50a513
@@ -641,4 +655,8 @@ All major and minor version changes will be documented in this file. Details of
641655
[#1528]: https://github.com/gchq/CyberChef/pull/1528
642656
[#661]: https://github.com/gchq/CyberChef/pull/661
643657
[#493]: https://github.com/gchq/CyberChef/pull/493
644-
658+
[#592]: https://github.com/gchq/CyberChef/issues/592
659+
[#1703]: https://github.com/gchq/CyberChef/issues/1703
660+
[#1675]: https://github.com/gchq/CyberChef/issues/1675
661+
[#1678]: https://github.com/gchq/CyberChef/issues/1678
662+
[#1541]: https://github.com/gchq/CyberChef/issues/1541

Gruntfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ module.exports = function (grunt) {
197197
},
198198
webpack: {
199199
options: webpackConfig,
200+
myConfig: webpackConfig,
200201
web: webpackProdConf(),
201202
},
202203
"webpack-dev-server": {

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ CyberChef is built to support
8989

9090
## Node.js support
9191

92-
CyberChef is built to fully support Node.js `v16`. For more information, see the Node API page in the project [wiki pages](https://github.com/gchq/CyberChef/wiki)
92+
CyberChef is built to fully support Node.js `v16`. For more information, see the ["Node API" wiki page](https://github.com/gchq/CyberChef/wiki/Node-API)
9393

9494

9595
## Contributing
9696

9797
Contributing a new operation to CyberChef is super easy! The quickstart script will walk you through the process. If you can write basic JavaScript, you can write a CyberChef operation.
9898

99-
An installation walkthrough, how-to guides for adding new operations and themes, descriptions of the repository structure, available data types and coding conventions can all be found in the project [wiki pages](https://github.com/gchq/CyberChef/wiki).
99+
An installation walkthrough, how-to guides for adding new operations and themes, descriptions of the repository structure, available data types and coding conventions can all be found in the ["Contributing" wiki page](https://github.com/gchq/CyberChef/wiki/Contributing).
100100

101101
- Push your changes to your fork.
102102
- Submit a pull request. If you are doing this for the first time, you will be prompted to sign the [GCHQ Contributor Licence Agreement](https://cla-assistant.io/gchq/CyberChef) via the CLA assistant on the pull request. This will also ask whether you are happy for GCHQ to contact you about a token of thanks for your contribution, or about job opportunities at GCHQ.

package-lock.json

+70-52
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cyberchef",
3-
"version": "10.4.0",
3+
"version": "10.6.0",
44
"description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
55
"author": "n1474335 <[email protected]>",
66
"homepage": "https://gchq.github.io/CyberChef",
@@ -55,7 +55,7 @@
5555
"babel-plugin-dynamic-import-node": "^2.3.3",
5656
"babel-plugin-transform-builtin-extend": "1.1.2",
5757
"base64-loader": "^1.0.0",
58-
"chromedriver": "^110.0.0",
58+
"chromedriver": "^121.0.0",
5959
"cli-progress": "^3.12.0",
6060
"colors": "^1.4.0",
6161
"copy-webpack-plugin": "^11.0.0",
@@ -95,6 +95,7 @@
9595
"@astronautlabs/amf": "^0.0.6",
9696
"@babel/polyfill": "^7.12.1",
9797
"@blu3r4y/lzma": "^2.3.3",
98+
"@wavesenterprise/crypto-gost-js": "^2.1.0-RC1",
9899
"argon2-browser": "^1.18.0",
99100
"arrive": "^2.4.1",
100101
"avsc": "^5.7.7",
@@ -181,7 +182,7 @@
181182
"build": "npx grunt prod",
182183
"node": "npx grunt node",
183184
"repl": "node --experimental-modules --experimental-json-modules --experimental-specifier-resolution=node --no-experimental-fetch --no-warnings src/node/repl.mjs",
184-
"test": "npx grunt configTests && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation --openssl-legacy-provider --no-experimental-fetch tests/node/index.mjs && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation --openssl-legacy-provider --no-experimental-fetch tests/operations/index.mjs",
185+
"test": "npx grunt configTests && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation --openssl-legacy-provider --no-experimental-fetch tests/node/index.mjs && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation --openssl-legacy-provider --no-experimental-fetch --trace-uncaught tests/operations/index.mjs",
185186
"testnodeconsumer": "npx grunt testnodeconsumer",
186187
"testui": "npx grunt testui",
187188
"testuidev": "npx nightwatch --env=dev",

0 commit comments

Comments
 (0)