Skip to content

fix jshint errors when run npm run test #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix jshint errors when run npm run test #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"esversion": 6,
"bitwise": false, // Prohibits the use of bitwise operators (not confuse & with &&)
"curly": true, // Requires to always put curly braces around blocks in loops and conditionals
"eqeqeq": false, // Prohibits the use of == and != in favor of === and !==
Expand Down Expand Up @@ -28,6 +29,8 @@
"Uint8ClampedArray": true,
"ArrayBuffer": true,
"Float32Array": true,
"Float64Array": true
"Float64Array": true,
"self": false,
"globalThis": false
}
}
7 changes: 4 additions & 3 deletions src/cipher-core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,15 +772,16 @@ CryptoJS.lib.Cipher || (function (undefined) {
}

// Derive key and IV
let key;
if (!hasher) {
var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
} else {
var key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);
key = EvpKDF.create({ keySize: keySize + ivSize, hasher: hasher }).compute(password, salt);
}


// Separate key and IV
var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
const iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
key.sigBytes = keySize * 4;

// Return params
Expand Down