mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-05-07 06:57:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix workflows

Browse source
This commit is contained in:
Hare Sudhan 2024-02-25 16:42:08 -05:00
parent ab0bc52d3c
commit eadc74e4f4
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/pull_requests.yml vendored
View file

@ -21,8 +21,8 @@ jobs:
npm install npm install
npm run setheapsize npm run setheapsize
- name: Lint - name: Format & Lint
run: npm run style && npx grunt lint && git diff --exit-code run: (npm run style || npm run lint) && git diff --exit-code
- name: Unit Tests - name: Unit Tests
run: | run: |

1
package.json
View file

@ -191,7 +191,6 @@
"testuidev": "npx nightwatch --env=dev", "testuidev": "npx nightwatch --env=dev",
"lint": "npx grunt lint", "lint": "npx grunt lint",
"style": "prettier --write .", "style": "prettier --write .",
"check-style": "prettier --check .",
"postinstall": "npx grunt exec:fixCryptoApiImports && npx grunt exec:fixSnackbarMarkup", "postinstall": "npx grunt exec:fixCryptoApiImports && npx grunt exec:fixSnackbarMarkup",
"newop": "node --experimental-modules --experimental-json-modules src/core/config/scripts/newOperation.mjs", "newop": "node --experimental-modules --experimental-json-modules src/core/config/scripts/newOperation.mjs",
"minor": "node --experimental-modules --experimental-json-modules src/core/config/scripts/newMinorVersion.mjs", "minor": "node --experimental-modules --experimental-json-modules src/core/config/scripts/newMinorVersion.mjs",

9
src/core/operations/DeriveEVPKey.mjs
View file

@ -67,12 +67,15 @@ class DeriveEVPKey extends Operation {
iterations = args[2], iterations = args[2],
hasher = args[3], hasher = args[3],
salt = Utils.convertToByteString(args[4].string, args[4].option), salt = Utils.convertToByteString(args[4].string, args[4].option),
key = CryptoJS.EvpKDF(passphrase, salt, { key = CryptoJS.EvpKDF(
// lgtm [js/insufficient-password-hash] passphrase, // lgtm [js/insufficient-password-hash]
salt,
{
keySize: keySize, keySize: keySize,
hasher: CryptoJS.algo[hasher], hasher: CryptoJS.algo[hasher],
iterations: iterations iterations: iterations
}); }
);
return key.toString(CryptoJS.enc.Hex); return key.toString(CryptoJS.enc.Hex);
} }