diff --git a/.eslintrc.json b/.eslintrc.json index 38f1ab6f..901bd705 100755 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,7 @@ { "parser": "@babel/eslint-parser", "parserOptions": { - "ecmaVersion": 9, + "ecmaVersion": 2022, "ecmaFeatures": { "impliedStrict": true }, diff --git a/src/core/Recipe.mjs b/src/core/Recipe.mjs index 4c778873..3ce40aa4 100755 --- a/src/core/Recipe.mjs +++ b/src/core/Recipe.mjs @@ -230,14 +230,12 @@ class Recipe { this.lastRunOp = op; } catch (err) { // Return expected errors as output - if (err instanceof OperationError || - (err.type && err.type === "OperationError")) { + if (err instanceof OperationError || err?.type === "OperationError") { // Cannot rely on `err instanceof OperationError` here as extending // native types is not fully supported yet. dish.set(err.message, "string"); return i; - } else if (err instanceof DishError || - (err.type && err.type === "DishError")) { + } else if (err instanceof DishError || err?.type === "DishError") { dish.set(err.message, "string"); return i; } else { diff --git a/src/core/operations/DetectFileType.mjs b/src/core/operations/DetectFileType.mjs index c8cdb822..58d13c31 100644 --- a/src/core/operations/DetectFileType.mjs +++ b/src/core/operations/DetectFileType.mjs @@ -65,7 +65,7 @@ class DetectFileType extends Operation { Extension: ${type.extension} MIME type: ${type.mime}\n`; - if (type.description && type.description.length) { + if (type?.description?.length) { output += `Description: ${type.description}\n`; } diff --git a/src/core/operations/ScanForEmbeddedFiles.mjs b/src/core/operations/ScanForEmbeddedFiles.mjs index 411b4c1d..2e83fcb9 100644 --- a/src/core/operations/ScanForEmbeddedFiles.mjs +++ b/src/core/operations/ScanForEmbeddedFiles.mjs @@ -60,7 +60,7 @@ class ScanForEmbeddedFiles extends Operation { Extension: ${type.fileDetails.extension} MIME type: ${type.fileDetails.mime}\n`; - if (type.fileDetails.description && type.fileDetails.description.length) { + if (type?.fileDetails?.description?.length) { output += ` Description: ${type.fileDetails.description}\n`; } }); diff --git a/src/core/vendor/gost/gostCipher.mjs b/src/core/vendor/gost/gostCipher.mjs index 18883c1f..8505fd34 100644 --- a/src/core/vendor/gost/gostCipher.mjs +++ b/src/core/vendor/gost/gostCipher.mjs @@ -2,7 +2,7 @@ * GOST 28147-89/GOST R 34.12-2015/GOST R 32.13-2015 Encryption Algorithm * 1.76 * 2014-2016, Rudolf Nickolaev. All rights reserved. - * + * * Exported for CyberChef by mshwed [m@ttshwed.com] */ @@ -18,7 +18,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -29,7 +29,7 @@ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * */ import GostRandom from './gostRandom.mjs'; @@ -37,10 +37,10 @@ import GostRandom from './gostRandom.mjs'; import crypto from 'crypto' /* -* Initial parameters and common algortithms of GOST 28147-89 -* +* Initial parameters and common algortithms of GOST 28147-89 +* * http://tools.ietf.org/html/rfc5830 -* +* */ // var root = {}; @@ -198,7 +198,7 @@ function randomSeed(e) { function buffer(d) { if (d instanceof CryptoOperationData) return d; - else if (d && d.buffer && d.buffer instanceof CryptoOperationData) + else if (d && d?.buffer instanceof CryptoOperationData) return d.byteOffset === 0 && d.byteLength === d.buffer.byteLength ? d.buffer : new Uint8Array(new Uint8Array(d, d.byteOffset, d.byteLength)).buffer; else @@ -232,9 +232,9 @@ function swap32(b) { // /* - * Initial parameters and common algortithms of GOST R 34.12-15 + * Initial parameters and common algortithms of GOST R 34.12-15 * Algorithm "Kuznechik" 128bit - * + * */ // // Default initial vector @@ -243,17 +243,17 @@ var defaultIV128 = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Mult table for R function var multTable = (function () { - // Multiply two numbers in the GF(2^8) finite field defined + // Multiply two numbers in the GF(2^8) finite field defined // by the polynomial x^8 + x^7 + x^6 + x + 1 = 0 */ function gmul(a, b) { var p = 0, counter, carry; for (counter = 0; counter < 8; counter++) { if (b & 1) p ^= a; - carry = a & 0x80; // detect if x^8 term is about to be generated + carry = a & 0x80; // detect if x^8 term is about to be generated a = (a << 1) & 0xff; if (carry) - a ^= 0xc3; // replace x^8 with x^7 + x^6 + x + 1 + a ^= 0xc3; // replace x^8 with x^7 + x^6 + x + 1 b >>= 1; } return p & 0xff; @@ -379,7 +379,7 @@ function funcC(number, d) { /** * Key schedule for GOST R 34.12-15 128bits - * + * * @memberOf GostCipher * @private * @instance @@ -404,8 +404,8 @@ function keySchedule128(k) // } // /** - * GOST R 34.12-15 128 bits encrypt/decrypt process - * + * GOST R 34.12-15 128 bits encrypt/decrypt process + * * @memberOf GostCipher * @private * @instance @@ -434,14 +434,14 @@ function process128(k, d, ofs, e) // /** * One GOST encryption round - * + * * @memberOf GostCipher * @private * @instance * @method round * @param {Int8Array} S sBox - * @param {Int32Array} m 2x32 bits cipher block - * @param {Int32Array} k 32 bits key[i] + * @param {Int32Array} m 2x32 bits cipher block + * @param {Int32Array} k 32 bits key[i] */ function round(S, m, k) // { @@ -465,13 +465,13 @@ function round(S, m, k) // /** * Process encrypt/decrypt block with key K using GOST 28147-89 - * + * * @memberOf GostCipher * @private * @instance * @method process - * @param k {Int32Array} 8x32 bits key - * @param d {Int32Array} 8x8 bits cipher block + * @param k {Int32Array} 8x32 bits key + * @param d {Int32Array} 8x8 bits cipher block * @param ofs {number} offset */ function process89(k, d, ofs) // @@ -490,13 +490,13 @@ function process89(k, d, ofs) // /** * Process encrypt/decrypt block with key K using GOST R 34.12-15 64bit block - * + * * @memberOf GostCipher * @private * @instance * @method process - * @param k {Int32Array} 8x32 bits key - * @param d {Int32Array} 8x8 bits cipher block + * @param k {Int32Array} 8x32 bits key + * @param d {Int32Array} 8x8 bits cipher block * @param ofs {number} offset */ function process15(k, d, ofs) // @@ -517,7 +517,7 @@ function process15(k, d, ofs) // /** * Key keySchedule algorithm for GOST 28147-89 64bit cipher - * + * * @memberOf GostCipher * @private * @instance @@ -556,7 +556,7 @@ function keySchedule89(k, e) // /** * Key keySchedule algorithm for GOST R 34.12-15 64bit cipher - * + * * @memberOf GostCipher * @private * @instance @@ -595,9 +595,9 @@ function keySchedule15(k, e) // /** * Key schedule for RC2 - * + * * https://tools.ietf.org/html/rfc2268 - * + * * @memberOf GostCipher * @private * @instance @@ -649,10 +649,10 @@ var keyScheduleRC2 = (function () // )(); /** - * RC2 encrypt/decrypt process - * + * RC2 encrypt/decrypt process + * * https://tools.ietf.org/html/rfc2268 - * + * * @memberOf GostCipher * @private * @instance @@ -734,13 +734,13 @@ var processRC2 = (function () // /** * Algorithm name GOST 28147-ECB

- * - * encryptECB (K, D) is D, encrypted with key k using GOST 28147/GOST R 34.13 in - * "prostaya zamena" (Electronic Codebook, ECB) mode. + * + * encryptECB (K, D) is D, encrypted with key k using GOST 28147/GOST R 34.13 in + * "prostaya zamena" (Electronic Codebook, ECB) mode. * @memberOf GostCipher * @method encrypt * @instance - * @param k {CryptoOperationData} 8x32 bit key + * @param k {CryptoOperationData} 8x32 bit key * @param d {CryptoOperationData} 8 bits message * @return {CryptoOperationData} result */ @@ -759,14 +759,14 @@ function encryptECB(k, d) // /** * Algorithm name GOST 28147-ECB

- * - * decryptECB (K, D) is D, decrypted with key K using GOST 28147/GOST R 34.13 in + * + * decryptECB (K, D) is D, decrypted with key K using GOST 28147/GOST R 34.13 in * "prostaya zamena" (Electronic Codebook, ECB) mode. - * + * * @memberOf GostCipher * @method decrypt * @instance - * @param k {CryptoOperationData} 8x32 bits key + * @param k {CryptoOperationData} 8x32 bits key * @param d {CryptoOperationData} 8 bits message * @return {CryptoOperationData} result */ @@ -785,16 +785,16 @@ function decryptECB(k, d) // /** * Algorithm name GOST 28147-CFB

- * - * encryptCFB (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 - * in "gammirovanie s obratnoj svyaziyu" (Cipher Feedback, CFB) mode, and IV is + * + * encryptCFB (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 + * in "gammirovanie s obratnoj svyaziyu" (Cipher Feedback, CFB) mode, and IV is * used as the initialization vector. - * + * * @memberOf GostCipher * @method encrypt * @instance - * @param {CryptoOperationData} k 8x32 bits key - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv initial vector * @return {CryptoOperationData} result */ @@ -838,16 +838,16 @@ function encryptCFB(k, d, iv) // /** * Algorithm name GOST 28147-CFB

- * - * decryptCFB (IV, K, D) is D, decrypted with key K using GOST 28147/GOST R 34.13 - * in "gammirovanie s obratnoj svyaziyu po shifrotekstu" (Cipher Feedback, CFB) mode, and IV is + * + * decryptCFB (IV, K, D) is D, decrypted with key K using GOST 28147/GOST R 34.13 + * in "gammirovanie s obratnoj svyaziyu po shifrotekstu" (Cipher Feedback, CFB) mode, and IV is * used as the initialization vector. - * + * * @memberOf GostCipher * @method decrypt * @instance - * @param {CryptoOperationData} k 8x32 bits key - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv initial vector * @return {CryptoOperationData} result */ @@ -893,31 +893,31 @@ function decryptCFB(k, d, iv) // /** * Algorithm name GOST 28147-OFB

- * - * encryptOFB/decryptOFB (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 - * in "gammirovanie s obratnoj svyaziyu po vyhodu" (Output Feedback, OFB) mode, and IV is + * + * encryptOFB/decryptOFB (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 + * in "gammirovanie s obratnoj svyaziyu po vyhodu" (Output Feedback, OFB) mode, and IV is * used as the initialization vector. - * + * * @memberOf GostCipher * @method encrypt * @instance - * @param {CryptoOperationData} k 8x32 bits key - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv 8x8 optional bits initial vector * @return {CryptoOperationData} result */ /** * Algorithm name GOST 28147-OFB

- * - * encryptOFB/decryptOFB (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 - * in "gammirovanie s obratnoj svyaziyu po vyhodu" (Output Feedback, OFB) mode, and IV is + * + * encryptOFB/decryptOFB (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 + * in "gammirovanie s obratnoj svyaziyu po vyhodu" (Output Feedback, OFB) mode, and IV is * used as the initialization vector. - * + * * @memberOf GostCipher * @method decrypt * @instance - * @param {CryptoOperationData} k 8x32 bits key - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv initial vector * @return {CryptoOperationData} result */ @@ -965,29 +965,29 @@ function processOFB(k, d, iv) // /** * Algorithm name GOST 28147-CTR

- * - * encryptCTR/decryptCTR (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 - * in "gammirovanie" (Counter Mode-CTR) mode, and IV is used as the + * + * encryptCTR/decryptCTR (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 + * in "gammirovanie" (Counter Mode-CTR) mode, and IV is used as the * initialization vector. * @memberOf GostCipher * @method encrypt * @instance - * @param {CryptoOperationData} k 8x32 bits key - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv 8x8 optional bits initial vector * @return {CryptoOperationData} result */ /** * Algorithm name GOST 28147-CTR

- * - * encryptCTR/decryptCTR (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 - * in "gammirovanie" (Counter Mode-CTR) mode, and IV is used as the + * + * encryptCTR/decryptCTR (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 + * in "gammirovanie" (Counter Mode-CTR) mode, and IV is used as the * initialization vector. * @memberOf GostCipher * @method decrypt * @instance - * @param {CryptoOperationData} k 8x32 bits key - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv initial vector * @return {CryptoOperationData} result */ @@ -1081,16 +1081,16 @@ function processCTR15(k, d, iv) // /** * Algorithm name GOST 28147-CBC

- * - * encryptCBC (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 - * in "Prostaya zamena s zatsepleniem" (Cipher-Block-Chaining, CBC) mode and IV is used as the initialization + * + * encryptCBC (IV, K, D) is D, encrypted with key K using GOST 28147/GOST R 34.13 + * in "Prostaya zamena s zatsepleniem" (Cipher-Block-Chaining, CBC) mode and IV is used as the initialization * vector. - * + * * @memberOf GostCipher * @method encrypt * @instance - * @param {CryptoOperationData} k 8x32 bits key - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv initial vector * @return {CryptoOperationData} result */ @@ -1128,16 +1128,16 @@ function encryptCBC(k, d, iv) // /** * Algorithm name GOST 28147-CBC

- * - * decryptCBC (IV, K, D) is D, decrypted with key K using GOST 28147/GOST R 34.13 - * in "Prostaya zamena s zatsepleniem" (Cipher-Block-Chaining, CBC) mode and IV is used as the initialization + * + * decryptCBC (IV, K, D) is D, decrypted with key K using GOST 28147/GOST R 34.13 + * in "Prostaya zamena s zatsepleniem" (Cipher-Block-Chaining, CBC) mode and IV is used as the initialization * vector. - * + * * @memberOf GostCipher * @method decrypt * @instance - * @param {CryptoOperationData} k 8x32 bits key - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv initial vector * @return {CryptoOperationData} result */ @@ -1176,7 +1176,7 @@ function decryptCBC(k, d, iv) // /** * The generateKey method returns a new generated key. - * + * * @memberOf GostCipher * @method generateKey * @instance @@ -1193,18 +1193,18 @@ function generateKey() // /** - * makeIMIT (K, D) is the 32-bit result of the GOST 28147/GOST R 34.13 in - * "imitovstavka" (MAC) mode, used with D as plaintext, K as key and IV - * as initialization vector. Note that the standard specifies its use + * makeIMIT (K, D) is the 32-bit result of the GOST 28147/GOST R 34.13 in + * "imitovstavka" (MAC) mode, used with D as plaintext, K as key and IV + * as initialization vector. Note that the standard specifies its use * in this mode only with an initialization vector of zero. - * + * * @memberOf GostCipher * @method processMAC * @private * @instance - * @param {Int32Array} key 8x32 bits key + * @param {Int32Array} key 8x32 bits key * @param {Int32Array} s 8x8 sum array - * @param {Uint8Array} d 8 bits array with data + * @param {Uint8Array} d 8 bits array with data * @return {Uint8Array} result */ function processMAC89(key, s, d) // @@ -1271,16 +1271,16 @@ function processMAC15(key, s, d) // } // /** - * signMAC (K, D, IV) is the 32-bit result of the GOST 28147/GOST R 34.13 in - * "imitovstavka" (MAC) mode, used with D as plaintext, K as key and IV - * as initialization vector. Note that the standard specifies its use + * signMAC (K, D, IV) is the 32-bit result of the GOST 28147/GOST R 34.13 in + * "imitovstavka" (MAC) mode, used with D as plaintext, K as key and IV + * as initialization vector. Note that the standard specifies its use * in this mode only with an initialization vector of zero. - * + * * @memberOf GostCipher * @method sign * @instance - * @param {CryptoOperationData} k 8x32 bits key - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv initial vector * @return {CryptoOperationData} result */ @@ -1298,17 +1298,17 @@ function signMAC(k, d, iv) // } // /** - * verifyMAC (K, M, D, IV) the 32-bit result verification of the GOST 28147/GOST R 34.13 in - * "imitovstavka" (MAC) mode, used with D as plaintext, K as key and IV - * as initialization vector. Note that the standard specifies its use + * verifyMAC (K, M, D, IV) the 32-bit result verification of the GOST 28147/GOST R 34.13 in + * "imitovstavka" (MAC) mode, used with D as plaintext, K as key and IV + * as initialization vector. Note that the standard specifies its use * in this mode only with an initialization vector of zero. - * + * * @memberOf GostCipher * @method verify * @instance - * @param {CryptoOperationData} k 8x32 bits key + * @param {CryptoOperationData} k 8x32 bits key * @param {CryptoOperationData} m 8 bits array with signature - * @param {CryptoOperationData} d 8 bits array with data + * @param {CryptoOperationData} d 8 bits array with data * @param {CryptoOperationData} iv 8x8 optional bits initial vector * @return {boolen} MAC verified = true */ @@ -1326,14 +1326,14 @@ function verifyMAC(k, m, d, iv) // /** * Algorithm name GOST 28147-KW

- * + * * This algorithm encrypts GOST 28147-89 CEK with a GOST 28147/GOST R 34.13 KEK. * Ref. rfc4357 6.1 GOST 28147-89 Key Wrap - * Note: This algorithm MUST NOT be used with a KEK produced by VKO GOST - * R 34.10-94, because such a KEK is constant for every sender-recipient - * pair. Encrypting many different content encryption keys on the same + * Note: This algorithm MUST NOT be used with a KEK produced by VKO GOST + * R 34.10-94, because such a KEK is constant for every sender-recipient + * pair. Encrypting many different content encryption keys on the same * constant KEK may reveal that KEK. - * + * * @memberOf GostCipher * @method wrapKey * @instance @@ -1344,14 +1344,14 @@ function verifyMAC(k, m, d, iv) // function wrapKeyGOST(kek, cek) // { var n = this.blockSize, k = this.keySize, len = k + (n >> 1); - // 1) For a unique symmetric KEK, generate 8 octets at random and call - // the result UKM. For a KEK, produced by VKO GOST R 34.10-2001, use - // the UKM that was used for key derivation. - if (!this.ukm) + // 1) For a unique symmetric KEK, generate 8 octets at random and call + // the result UKM. For a KEK, produced by VKO GOST R 34.10-2001, use + // the UKM that was used for key derivation. + if (!this.ukm) throw new DataError('UKM must be defined'); var ukm = new Uint8Array(this.ukm); - // 2) Compute a 4-byte checksum value, GOST 28147IMIT (UKM, KEK, CEK). - // Call the result CEK_MAC. + // 2) Compute a 4-byte checksum value, GOST 28147IMIT (UKM, KEK, CEK). + // Call the result CEK_MAC. var mac = signMAC.call(this, kek, cek, ukm); // 3) Encrypt the CEK in ECB mode using the KEK. Call the ciphertext CEK_ENC. var enc = encryptECB.call(this, kek, cek); @@ -1364,10 +1364,10 @@ function wrapKeyGOST(kek, cek) // /** * Algorithm name GOST 28147-KW

- * + * * This algorithm decrypts GOST 28147-89 CEK with a GOST 28147 KEK. * Ref. rfc4357 6.2 GOST 28147-89 Key Unwrap - * + * * @memberOf GostCipher * @method unwrapKey * @instance @@ -1382,9 +1382,9 @@ function unwrapKeyGOST(kek, data) // var d = buffer(data); if (d.byteLength !== len) throw new DataError('Wrapping key size must be ' + len + ' bytes'); - // 2) Decompose the wrapped content-encryption key into UKM, CEK_ENC, and CEK_MAC. - // UKM is the most significant (first) 8 octets. CEK_ENC is next 32 octets, - // and CEK_MAC is the least significant (last) 4 octets. + // 2) Decompose the wrapped content-encryption key into UKM, CEK_ENC, and CEK_MAC. + // UKM is the most significant (first) 8 octets. CEK_ENC is next 32 octets, + // and CEK_MAC is the least significant (last) 4 octets. if (!this.ukm) throw new DataError('UKM must be defined'); var ukm = new Uint8Array(this.ukm), @@ -1392,7 +1392,7 @@ function unwrapKeyGOST(kek, data) // mac = new Uint8Array(d, k, n >> 1); // 3) Decrypt CEK_ENC in ECB mode using the KEK. Call the output CEK. var cek = decryptECB.call(this, kek, enc); - // 4) Compute a 4-byte checksum value, GOST 28147IMIT (UKM, KEK, CEK), + // 4) Compute a 4-byte checksum value, GOST 28147IMIT (UKM, KEK, CEK), // compare the result with CEK_MAC. If they are not equal, then error. var check = verifyMAC.call(this, kek, mac, cek, ukm); if (!check) @@ -1402,11 +1402,11 @@ function unwrapKeyGOST(kek, data) // /** * Algorithm name GOST 28147-CPKW

- * - * Given a random 64-bit UKM and a GOST 28147 key K, this algorithm + * + * Given a random 64-bit UKM and a GOST 28147 key K, this algorithm * creates a new GOST 28147-89 key K(UKM). * Ref. rfc4357 6.3 CryptoPro KEK Diversification Algorithm - * + * * @memberOf GostCipher * @method diversify * @instance @@ -1419,10 +1419,10 @@ function diversifyKEK(kek, ukm) // { var n = this.blockSize; - // 1) Let K[0] = K; + // 1) Let K[0] = K; var k = intArray(kek); - // 2) UKM is split into components a[i,j]: - // UKM = a[0]|..|a[7] (a[i] - byte, a[i,0]..a[i,7] - it’s bits) + // 2) UKM is split into components a[i,j]: + // UKM = a[0]|..|a[7] (a[i] - byte, a[i,0]..a[i,7] - it’s bits) var a = []; for (var i = 0; i < n; i++) { a[i] = []; @@ -1430,15 +1430,15 @@ function diversifyKEK(kek, ukm) // a[i][j] = (ukm[i] >>> j) & 0x1; } } - // 3) Let i be 0. - // 4) K[1]..K[8] are calculated by repeating the following algorithm - // eight times: + // 3) Let i be 0. + // 4) K[1]..K[8] are calculated by repeating the following algorithm + // eight times: for (var i = 0; i < n; i++) { // A) K[i] is split into components k[i,j]: // K[i] = k[i,0]|k[i,1]|..|k[i,7] (k[i,j] - 32-bit integer) - // B) Vector S[i] is calculated: - // S[i] = ((a[i,0]*k[i,0] + ... + a[i,7]*k[i,7]) mod 2^32) | - // (((~a[i,0])*k[i,0] + ... + (~a[i,7])*k[i,7]) mod 2^32); + // B) Vector S[i] is calculated: + // S[i] = ((a[i,0]*k[i,0] + ... + a[i,7]*k[i,7]) mod 2^32) | + // (((~a[i,0])*k[i,0] + ... + (~a[i,7])*k[i,7]) mod 2^32); var s = new Int32Array(2); for (var j = 0; j < 8; j++) { if (a[i][j]) @@ -1457,12 +1457,12 @@ function diversifyKEK(kek, ukm) // /** * Algorithm name GOST 28147-CPKW

- * - * This algorithm encrypts GOST 28147-89 CEK with a GOST 28147 KEK. - * It can be used with any KEK (e.g., produced by VKO GOST R 34.10-94 or + * + * This algorithm encrypts GOST 28147-89 CEK with a GOST 28147 KEK. + * It can be used with any KEK (e.g., produced by VKO GOST R 34.10-94 or * VKO GOST R 34.10-2001) because a unique UKM is used to diversify the KEK. * Ref. rfc4357 6.3 CryptoPro Key Wrap - * + * * @memberOf GostCipher * @method wrapKey * @instance @@ -1473,21 +1473,21 @@ function diversifyKEK(kek, ukm) // function wrapKeyCP(kek, cek) // { var n = this.blockSize, k = this.keySize, len = k + (n >> 1); - // 1) For a unique symmetric KEK or a KEK produced by VKO GOST R - // 34.10-94, generate 8 octets at random. Call the result UKM. For - // a KEK, produced by VKO GOST R 34.10-2001, use the UKM that was + // 1) For a unique symmetric KEK or a KEK produced by VKO GOST R + // 34.10-94, generate 8 octets at random. Call the result UKM. For + // a KEK, produced by VKO GOST R 34.10-2001, use the UKM that was // used for key derivation. - if (!this.ukm) + if (!this.ukm) throw new DataError('UKM must be defined'); var ukm = new Uint8Array(this.ukm); - // 2) Diversify KEK, using the CryptoPro KEK Diversification Algorithm, + // 2) Diversify KEK, using the CryptoPro KEK Diversification Algorithm, // described in Section 6.5. Call the result KEK(UKM). var dek = diversifyKEK.call(this, kek, ukm); - // 3) Compute a 4-byte checksum value, GOST 28147IMIT (UKM, KEK(UKM), - // CEK). Call the result CEK_MAC. + // 3) Compute a 4-byte checksum value, GOST 28147IMIT (UKM, KEK(UKM), + // CEK). Call the result CEK_MAC. var mac = signMAC.call(this, dek, cek, ukm); - // 4) Encrypt CEK in ECB mode using KEK(UKM). Call the ciphertext - // CEK_ENC. + // 4) Encrypt CEK in ECB mode using KEK(UKM). Call the ciphertext + // CEK_ENC. var enc = encryptECB.call(this, dek, cek); // 5) The wrapped content-encryption key is (UKM | CEK_ENC | CEK_MAC). var r = new Uint8Array(len); @@ -1498,8 +1498,8 @@ function wrapKeyCP(kek, cek) // /** * Algorithm name GOST 28147-CPKW

- * - * This algorithm encrypts GOST 28147-89 CEK with a GOST 28147 KEK. + * + * This algorithm encrypts GOST 28147-89 CEK with a GOST 28147 KEK. * Ref. rfc4357 6.4 CryptoPro Key Unwrap * * @memberOf GostCipher @@ -1512,26 +1512,26 @@ function wrapKeyCP(kek, cek) // function unwrapKeyCP(kek, data) // { var n = this.blockSize, k = this.keySize, len = k + (n >> 1); - // 1) If the wrapped content-encryption key is not 44 octets, then error. + // 1) If the wrapped content-encryption key is not 44 octets, then error. var d = buffer(data); if (d.byteLength !== len) throw new DataError('Wrapping key size must be ' + len + ' bytes'); - // 2) Decompose the wrapped content-encryption key into UKM, CEK_ENC, - // and CEK_MAC. UKM is the most significant (first) 8 octets. - // CEK_ENC is next 32 octets, and CEK_MAC is the least significant - // (last) 4 octets. + // 2) Decompose the wrapped content-encryption key into UKM, CEK_ENC, + // and CEK_MAC. UKM is the most significant (first) 8 octets. + // CEK_ENC is next 32 octets, and CEK_MAC is the least significant + // (last) 4 octets. if (!this.ukm) throw new DataError('UKM must be defined'); var ukm = new Uint8Array(this.ukm), enc = new Uint8Array(d, 0, k), mac = new Uint8Array(d, k, n >> 1); - // 3) Diversify KEK using the CryptoPro KEK Diversification Algorithm, - // described in section 6.5. Call the result KEK(UKM). + // 3) Diversify KEK using the CryptoPro KEK Diversification Algorithm, + // described in section 6.5. Call the result KEK(UKM). var dek = diversifyKEK.call(this, kek, ukm); - // 4) Decrypt CEK_ENC in ECB mode using KEK(UKM). Call the output CEK. + // 4) Decrypt CEK_ENC in ECB mode using KEK(UKM). Call the output CEK. var cek = decryptECB.call(this, dek, enc); - // 5) Compute a 4-byte checksum value, GOST 28147IMIT (UKM, KEK(UKM), - // CEK), compare the result with CEK_MAC. If they are not equal, + // 5) Compute a 4-byte checksum value, GOST 28147IMIT (UKM, KEK(UKM), + // CEK), compare the result with CEK_MAC. If they are not equal, // then it is an error. var check = verifyMAC.call(this, dek, mac, cek, ukm); if (!check) @@ -1541,23 +1541,23 @@ function unwrapKeyCP(kek, data) // /** * SignalCom master key packing algorithm - * + * * kek stored in 3 files - kek.opq, mk.db3, masks.db3 * kek.opq - always 36 bytes length = 32 bytes encrypted kek + 4 bytes mac of decrypted kek - * mk.db3 - 6 bytes header (1 byte magic code 0x22 + 1 byte count of masks + 4 bytes mac of - * xor summarizing masks value) + attached masks - * masks.db3 - detached masks. + * mk.db3 - 6 bytes header (1 byte magic code 0x22 + 1 byte count of masks + 4 bytes mac of + * xor summarizing masks value) + attached masks + * masks.db3 - detached masks. * Total length of attached + detached masks = 32 bits * count of masks - * Default value of count 8 = (7 attached + 1 detached). But really no reason for such + * Default value of count 8 = (7 attached + 1 detached). But really no reason for such * separation - all masks xor summarizing - order is not matter. - * Content of file rand.opq can used as ukm. Don't forget change file content after using. - * - * For usb-token files has names: + * Content of file rand.opq can used as ukm. Don't forget change file content after using. + * + * For usb-token files has names: * a001 - mk.db3, b001 - masks.db3, c001 - kek.opq, d001 - rand.opq * For windows registry - * 00000001 - mk.db3, 00000002 - masks.db3, 00000003 - key.opq, 00000004 - rand.opq, + * 00000001 - mk.db3, 00000002 - masks.db3, 00000003 - key.opq, 00000004 - rand.opq, * 00000006 - keys\00000001.key, 0000000A - certificate - * + * * @memberOf GostCipher * @method packKey * @instance @@ -1603,9 +1603,9 @@ function packKeySC(unpacked, ukm) // /** * Algorithm name GOST 28147-SCKW

- * + * * SignalCom master key unpacking algorithm - * + * * @memberOf GostCipher * @method unpackKey * @instance @@ -1650,14 +1650,14 @@ function unpackKeySC(packed) // /** * Algorithm name GOST 28147-SCKW

- * + * * SignalCom Key Wrapping algorithm - * + * * @memberOf GostCipher * @method wrapKey * @instance * @param {CryptoOperationData} kek - clear kek or concatination of mk.db3 + masks.db3 - * @param {CryptoOperationData} cek - key for wrapping + * @param {CryptoOperationData} cek - key for wrapping * @returns {CryptoOperationData} wrapped key - file kek.opq */ function wrapKeySC(kek, cek) // @@ -1677,13 +1677,13 @@ function wrapKeySC(kek, cek) // /** * Algorithm name GOST 28147-SCKW

- * + * * SignalCom Key UnWrapping algorithm - * + * * @memberOf GostCipher * @method unwrapKey * @instance - * @param {CryptoOperationData} kek - concatination of files mk.db3 + masks.db3 or clear kek + * @param {CryptoOperationData} kek - concatination of files mk.db3 + masks.db3 or clear kek * @param {CryptoOperationData} cek - wrapping key - file kek.opq * @return {CryptoOperationData} result */ @@ -1704,9 +1704,9 @@ function unwrapKeySC(kek, cek) // /** * Algorithm name GOST 28147-SCKW

- * + * * SignalCom master key generation for wrapping - * + * * @memberOf GostCipher * @method generateKey * @instance @@ -1719,24 +1719,24 @@ function generateWrappingKeySC() // function maskKey(mask, key, inverse, keySize) // { - var k = keySize / 4, + var k = keySize / 4, m32 = new Int32Array(buffer(mask)), - k32 = new Int32Array(buffer(key)), + k32 = new Int32Array(buffer(key)), r32 = new Int32Array(k); if (inverse) - for (var i = 0; i < k; i++) + for (var i = 0; i < k; i++) r32[i] = (k32[i] + m32[i]) & 0xffffffff; else - for (var i = 0; i < k; i++) + for (var i = 0; i < k; i++) r32[i] = (k32[i] - m32[i]) & 0xffffffff; return r32.buffer; } // /** * Algorithm name GOST 28147-MASK

- * + * * This algorithm wrap key mask - * + * * @memberOf GostCipher * @method wrapKey * @instance @@ -1751,7 +1751,7 @@ function wrapKeyMask(mask, key) // /** * Algorithm name GOST 28147-CPKW

- * + * * This algorithm unwrap key mask * * @memberOf GostCipher @@ -1768,17 +1768,17 @@ function unwrapKeyMask(mask, key) // /** * Algorithm name GOST 28147-CPKM

- * + * * Key meshing in according to rfc4357 2.3.2. CryptoPro Key Meshing - * + * * @memberOf GostCipher * @method keyMeshing * @instance * @private - * @param {(Uint8Array|CryptoOperationData)} k 8x8 bit key + * @param {(Uint8Array|CryptoOperationData)} k 8x8 bit key * @param {Uint8Array} s 8x8 bit sync (iv) * @param {Integer} i block index - * @param {Int32Array} key 8x32 bit key schedule + * @param {Int32Array} key 8x32 bit key schedule * @param {boolean} e true - decrypt * @returns CryptoOperationData next 8x8 bit key */ @@ -1797,12 +1797,12 @@ function keyMeshingCP(k, s, i, key, e) // /** * Null Key Meshing in according to rfc4357 2.3.1 - * + * * @memberOf GostCipher * @method keyMeshing * @instance * @private - * @param {(Uint8Array|CryptoOperationData)} k 8x8 bit key + * @param {(Uint8Array|CryptoOperationData)} k 8x8 bit key */ function noKeyMeshing(k) // { @@ -1811,9 +1811,9 @@ function noKeyMeshing(k) // /** * Algorithm name GOST 28147-NoPadding

- * + * * No padding. - * + * * @memberOf GostCipher * @method padding * @instance @@ -1828,11 +1828,11 @@ function noPad(d) // /** * Algorithm name GOST 28147-PKCS5Padding

- * - * PKCS#5 padding: 8-x remaining bytes are filled with the value of - * 8-x. If there’s no incomplete block, one extra block filled with + * + * PKCS#5 padding: 8-x remaining bytes are filled with the value of + * 8-x. If there’s no incomplete block, one extra block filled with * value 8 is added - * + * * @memberOf GostCipher * @method padding * @instance @@ -1870,9 +1870,9 @@ function pkcs5Unpad(d) // /** * Algorithm name GOST 28147-ZeroPadding

- * + * * Zero padding: 8-x remaining bytes are filled with zero - * + * * @memberOf GostCipher * @method padding * @instance @@ -1895,10 +1895,10 @@ function zeroPad(d) // /** * Algorithm name GOST 28147-BitPadding

- * - * Bit padding: P* = P || 1 || 000...0 If there’s no incomplete block, + * + * Bit padding: P* = P || 1 || 000...0 If there’s no incomplete block, * one extra block filled with 1 || 000...0 - * + * * @memberOf GostCipher * @method padding * @instance @@ -1906,7 +1906,7 @@ function zeroPad(d) // * @param {Uint8Array} d array with source data * @returns {Uint8Array} result */ -function bitPad(d) // +function bitPad(d) // { var n = d.byteLength, nb = this.blockSize, @@ -1919,7 +1919,7 @@ function bitPad(d) // return r; } // -function bitUnpad(d) // +function bitUnpad(d) // { var m = d.byteLength, n = m; @@ -1936,10 +1936,10 @@ function bitUnpad(d) // /** * Algorithm name GOST 28147-RandomPadding

- * - * Random padding: 8-x remaining bytes of the last block are set to + * + * Random padding: 8-x remaining bytes of the last block are set to * random. - * + * * @memberOf GostCipher * @method padding * @instance @@ -1960,15 +1960,15 @@ function randomPad(d) // } // /** - * GOST 28147-89 Encryption Algorithm

- * + * GOST 28147-89 Encryption Algorithm

+ * * References {@link http://tools.ietf.org/html/rfc5830}

- * - * When keys and initialization vectors are converted to/from byte arrays, + * + * When keys and initialization vectors are converted to/from byte arrays, * little-endian byte order is assumed.

- * + * * Normalized algorithm identifier common parameters: - * + * *
    *
  • name Algorithm name 'GOST 28147' or 'GOST R 34.12'
    • *
  • version Algorithm version, number @@ -1992,9 +1992,9 @@ function randomPad(d) // *
    • *
  • sBox Paramset sBox for GOST 28147-89, string. Used only if version = 1989
    • *
- * + * * Supported algorithms, modes and parameters: - * + * *
    *
  • Encript/Decrypt mode (ES) *
      @@ -2017,9 +2017,9 @@ function randomPad(d) // *
    *
    • *
- * + * * Supported paramters values: - * + * *
    *
  • Block modes (parameter 'block') *
      @@ -2053,7 +2053,7 @@ function randomPad(d) // *
    *
    • *
- * + * * @class GostCipher * @param {AlgorithmIndentifier} algorithm WebCryptoAPI algorithm identifier */ @@ -2076,7 +2076,7 @@ function GostCipher(algorithm) // ((algorithm.keyWrapping || 'NO') !== 'NO' ? algorithm.keyWrapping : '') + 'KW' : (algorithm.block || 'ECB') + ((algorithm.block === 'CFB' || algorithm.block === 'OFB' || (algorithm.block === 'CTR' && algorithm.version === 2015)) && - algorithm.shiftBits && algorithm.shiftBits !== this.blockLength ? '-' + algorithm.shiftBits : '') + + algorithm?.shiftBits !== this.blockLength ? '-' + algorithm.shiftBits : '') + (algorithm.padding ? '-' + (algorithm.padding || (algorithm.block === 'CTR' || algorithm.block === 'CFB' || algorithm.block === 'OFB' ? 'NO' : 'ZERO')) + 'PADDING' : '') + ((algorithm.keyMeshing || 'NO') !== 'NO' ? '-CPKEYMESHING' : '')) + @@ -2085,7 +2085,7 @@ function GostCipher(algorithm) // // Algorithm procreator this.procreator = algorithm.procreator; - + switch (algorithm.version || 1989) { case 1: this.process = processRC2; diff --git a/src/core/vendor/gost/gostCoding.mjs b/src/core/vendor/gost/gostCoding.mjs index b3f2d72a..758ff22a 100644 --- a/src/core/vendor/gost/gostCoding.mjs +++ b/src/core/vendor/gost/gostCoding.mjs @@ -2,7 +2,7 @@ * Coding algorithms: Base64, Hex, Int16, Chars, BER and PEM * version 1.76 * 2014-2016, Rudolf Nickolaev. All rights reserved. - * + * * Exported for CyberChef by mshwed [m@ttshwed.com] */ @@ -18,7 +18,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * THIS SOfTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES Of MERCHANTABILITY AND fITNESS fOR A PARTICULAR PURPOSE ARE @@ -29,16 +29,16 @@ * CAUSED AND ON ANY THEORY Of LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT Of THE USE * Of THIS SOfTWARE, EVEN If ADVISED Of THE POSSIBILITY OF SUCH DAMAGE. - * + * */ import gostCrypto from './gostCrypto.mjs'; /** - * The Coding interface provides string converting methods: Base64, Hex, + * The Coding interface provides string converting methods: Base64, Hex, * Int16, Chars, BER and PEM * @class GostCoding - * + * */ // var root = {}; var DataError = Error; @@ -48,7 +48,7 @@ var Date = Date; function buffer(d) { if (d instanceof CryptoOperationData) return d; - else if (d && d.buffer && d.buffer instanceof CryptoOperationData) + else if (d && d?.buffer instanceof CryptoOperationData) return d.byteOffset === 0 && d.byteLength === d.buffer.byteLength ? d.buffer : new Uint8Array(new Uint8Array(d, d.byteOffset, d.byteLength)).buffer; else @@ -60,13 +60,13 @@ function GostCoding() { /** * BASE64 conversion - * + * * @class GostCoding.Base64 */ var Base64 = {// /** * Base64.decode convert BASE64 string s to CryptoOperationData - * + * * @memberOf GostCoding.Base64 * @param {String} s BASE64 encoded string value * @returns {CryptoOperationData} Binary decoded data @@ -100,7 +100,7 @@ var Base64 = {// }, /** * Base64.encode(data) convert CryptoOperationData data to BASE64 string - * + * * @memberOf GostCoding.Base64 * @param {CryptoOperationData} data Bynary data for encoding * @returns {String} BASE64 encoded data @@ -129,7 +129,7 @@ var Base64 = {// /** * BASE64 conversion - * + * * @memberOf GostCoding * @insnance * @type GostCoding.Base64 @@ -139,7 +139,7 @@ GostCoding.prototype.Base64 = Base64; /** * Text string conversion
* Methods support charsets: ascii, win1251, utf8, utf16 (ucs2, unicode), utf32 (ucs4) - * + * * @class GostCoding.Chars */ var Chars = (function () { // @@ -162,8 +162,8 @@ var Chars = (function () { // return { /** - * Chars.decode(s, charset) convert string s with defined charset to CryptoOperationData - * + * Chars.decode(s, charset) convert string s with defined charset to CryptoOperationData + * * @memberOf GostCoding.Chars * @param {string} s Javascript string * @param {string} charset Charset, default 'win1251' @@ -236,7 +236,7 @@ var Chars = (function () { // }, /** * Chars.encode(data, charset) convert CryptoOperationData data to string with defined charset - * + * * @memberOf GostCoding.Chars * @param {CryptoOperationData} data Binary data * @param {string} charset Charset, default win1251 @@ -250,15 +250,15 @@ var Chars = (function () { // if (charset === 'utf8') { c = c >= 0xfc && c < 0xfe && i + 5 < n ? // six bytes (c - 0xfc) * 1073741824 + (d[++i] - 0x80 << 24) + (d[++i] - 0x80 << 18) + (d[++i] - 0x80 << 12) + (d[++i] - 0x80 << 6) + d[++i] - 0x80 - : c >> 0xf8 && c < 0xfc && i + 4 < n ? // five bytes + : c >> 0xf8 && c < 0xfc && i + 4 < n ? // five bytes (c - 0xf8 << 24) + (d[++i] - 0x80 << 18) + (d[++i] - 0x80 << 12) + (d[++i] - 0x80 << 6) + d[++i] - 0x80 - : c >> 0xf0 && c < 0xf8 && i + 3 < n ? // four bytes + : c >> 0xf0 && c < 0xf8 && i + 3 < n ? // four bytes (c - 0xf0 << 18) + (d[++i] - 0x80 << 12) + (d[++i] - 0x80 << 6) + d[++i] - 0x80 - : c >= 0xe0 && c < 0xf0 && i + 2 < n ? // three bytes + : c >= 0xe0 && c < 0xf0 && i + 2 < n ? // three bytes (c - 0xe0 << 12) + (d[++i] - 0x80 << 6) + d[++i] - 0x80 - : c >= 0xc0 && c < 0xe0 && i + 1 < n ? // two bytes + : c >= 0xc0 && c < 0xe0 && i + 1 < n ? // two bytes (c - 0xc0 << 6) + d[++i] - 0x80 - : c; // one byte + : c; // one byte } else if (charset === 'unicode' || charset === 'ucs2' || charset === 'utf16') { c = (c << 8) + d[++i]; if (c >= 0xD800 && c < 0xE000) { @@ -289,7 +289,7 @@ var Chars = (function () { // /** * Text string conversion - * + * * @memberOf GostCoding * @insnance * @type GostCoding.Chars @@ -298,13 +298,13 @@ GostCoding.prototype.Chars = Chars; /** * HEX conversion - * + * * @class GostCoding.Hex */ var Hex = {// /** * Hex.decode(s, endean) convert HEX string s to CryptoOperationData in endean mode - * + * * @memberOf GostCoding.Hex * @param {string} s Hex encoded string * @param {boolean} endean Little or Big Endean, default Little @@ -325,8 +325,8 @@ var Hex = {// }, /** * Hex.encode(data, endean) convert CryptoOperationData data to HEX string in endean mode - * - * @memberOf GostCoding.Hex + * + * @memberOf GostCoding.Hex * @param {CryptoOperationData} data Binary data * @param {boolean} endean Little/Big Endean, default Little * @returns {string} Hex decoded string @@ -358,15 +358,15 @@ GostCoding.prototype.Hex = Hex; /** * String hex-encoded integer conversion - * + * * @class GostCoding.Int16 */ var Int16 = {// /** * Int16.decode(s) convert hex big insteger s to CryptoOperationData - * - * @memberOf GostCoding.Int16 - * @param {string} s Int16 string + * + * @memberOf GostCoding.Int16 + * @param {string} s Int16 string * @returns {CryptoOperationData} Decoded binary data */ decode: function (s) { @@ -403,7 +403,7 @@ var Int16 = {// }, /** * Int16.encode(data) convert CryptoOperationData data to big integer hex string - * + * * @memberOf GostCoding.Int16 * @param {CryptoOperationData} data Binary data * @returns {string} Int16 encoded string @@ -438,7 +438,7 @@ GostCoding.prototype.Int16 = Int16; /** * BER, DER, CER conversion - * + * * @class GostCoding.BER */ var BER = (function () { // @@ -659,7 +659,7 @@ var BER = (function () { // case 0x1C: // UniversalString case 0x1E: // BMPString k = k || 0; - // Split content on 1000 octet len parts + // Split content on 1000 octet len parts var size = 1000; var bytelen = 0, ba = [], offset = 0; for (var i = k, n = content.length; i < n; i += size - k) { @@ -777,7 +777,7 @@ var BER = (function () { // } while (buf & 0x80); } - // Read len + // Read len buf = d[pos++]; len = buf & 0x7f; if (len !== buf) { @@ -979,7 +979,7 @@ var BER = (function () { // throw new DataError('Unrecognized time format "' + s + '" at offset ' + start); if (shortYear) { // Where YY is greater than or equal to 50, the year SHALL be interpreted as 19YY; and - // Where YY is less than 50, the year SHALL be interpreted as 20YY + // Where YY is less than 50, the year SHALL be interpreted as 20YY m[1] = +m[1]; m[1] += (m[1] < 50) ? 2000 : 1900; } @@ -1031,12 +1031,12 @@ var BER = (function () { // *
  • CryptoOperationData - OCTET STRING
    • * * SEQUENCE or SET arrays recursively encoded for each item.
    - * OCTET STRING and BIT STRING can presents as array with one item. + * OCTET STRING and BIT STRING can presents as array with one item. * It means encapsulates encoding for child element.
    - * - * If CONTEXT or APPLICATION classes item presents as array with one + * + * If CONTEXT or APPLICATION classes item presents as array with one * item we use EXPLICIT encoding for element, else IMPLICIT encoding.
    - * + * * @memberOf GostCoding.BER * @param {Object} object Object to encoding * @param {string} format Encoding rule: 'DER' or 'CER', default 'DER' @@ -1048,7 +1048,7 @@ var BER = (function () { // }, /** * BER.encode(data) convert ASN.1 format CryptoOperationData data to javascript object

    - * + * * Conversion rules to javascript object: *
      *
    • BOOLEAN - Boolean object
      • @@ -1057,7 +1057,7 @@ var BER = (function () { // *
    • OCTET STRING - Hex encoded string or Array with one item in case of incapsulates encoding
      • *
    • OBJECT IDENTIFIER - String with object identifier
      • *
    • SEQUENCE, SET - Array of encoded items
      • - *
    • UTF8String, NumericString, PrintableString, TeletexString, VideotexString, + *
    • UTF8String, NumericString, PrintableString, TeletexString, VideotexString, * IA5String, GraphicString, VisibleString, GeneralString, UniversalString, * BMPString - encoded String
      • *
    • UTCTime, GeneralizedTime - Date
      • @@ -1087,7 +1087,7 @@ GostCoding.prototype.BER = BER; var PEM = {// /** * PEM.encode(data, name) encode CryptoOperationData to PEM format with name label - * + * * @memberOf GostCoding.PEM * @param {(Object|CryptoOperationData)} data Java script object or BER-encoded binary data * @param {string} name Name of PEM object: 'certificate', 'private key' etc. @@ -1100,7 +1100,7 @@ var PEM = {// }, /** * PEM.decode(s, name, deep) decode PEM format s labeled name to CryptoOperationData or javascript object in according to deep parameter - * + * * @memberOf GostCoding.PEM * @param {string} s PEM encoded string * @param {string} name Name of PEM object: 'certificate', 'private key' etc. @@ -1151,10 +1151,10 @@ GostCoding.prototype.PEM = PEM; if (gostCrypto) /** * Coding algorithms: Base64, Hex, Int16, Chars, BER and PEM - * + * * @memberOf gostCrypto * @type GostCoding */ gostCrypto.coding = new GostCoding(); -export default GostCoding; \ No newline at end of file +export default GostCoding; diff --git a/src/core/vendor/gost/gostCrypto.mjs b/src/core/vendor/gost/gostCrypto.mjs index daf0cf97..77132f6c 100644 --- a/src/core/vendor/gost/gostCrypto.mjs +++ b/src/core/vendor/gost/gostCrypto.mjs @@ -2,11 +2,11 @@ * Implementation Web Crypto interfaces for GOST algorithms * 1.76 * 2014-2016, Rudolf Nickolaev. All rights reserved. - * + * * Exported for CyberChef by mshwed [m@ttshwed.com] */ -/* +/* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -29,7 +29,7 @@ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * */ import GostRandom from './gostRandom.mjs'; @@ -39,7 +39,7 @@ import crypto from 'crypto' /* * Algorithm normalization -* +* */ // var root = {}; @@ -233,7 +233,7 @@ function normalize(algorithm, method) { break; } - // Encrypt additional modes + // Encrypt additional modes if (na.mode === 'ES') { if (algorithm.block) na.block = algorithm.block; // ECB, CFB, OFB, CTR, CBC @@ -383,7 +383,7 @@ function checkNative(algorithm) { /* * Key conversion methods - * + * */ // // Check key parameter @@ -522,7 +522,7 @@ function swapBytes(src) { /** * Promise stub object (not fulfill specification, only for internal use) * Class not defined if Promise class already defined in root context

      - * + * * The Promise object is used for deferred and asynchronous computations. A Promise is in one of the three states: *
        *
      • pending: initial state, not fulfilled or rejected.
        • @@ -532,8 +532,8 @@ function swapBytes(src) { * Another term describing the state is settled: the Promise is either fulfilled or rejected, but not pending.

        * @class Promise * @global - * @param {function} executor Function object with two arguments resolve and reject. - * The first argument fulfills the promise, the second argument rejects it. + * @param {function} executor Function object with two arguments resolve and reject. + * The first argument fulfills the promise, the second argument rejects it. * We can call these functions, once our operation is completed. */ // if (!Promise) { @@ -588,15 +588,15 @@ if (!Promise) { } } /** - * The then() method returns a Promise. It takes two arguments, both are + * The then() method returns a Promise. It takes two arguments, both are * callback functions for the success and failure cases of the Promise. - * + * * @method then * @memberOf Promise * @instance * @param {function} onFulfilled A Function called when the Promise is fulfilled. This function has one argument, the fulfillment value. * @param {function} onRejected A Function called when the Promise is rejected. This function has one argument, the rejection reason. - * @returns {Promise} + * @returns {Promise} */ this.then = function (onFulfilled, onRejected) { @@ -611,7 +611,7 @@ if (!Promise) { return; } value = mswrap(value); - if (value && value.then && value.then.call) { + if (value && value?.then?.call) { value.then(resolve, reject); } else { resolve(value); @@ -627,7 +627,7 @@ if (!Promise) { return; } reason = mswrap(reason); - if (reason && reason.then && reason.then.call) { + if (reason && reason?.then?.call) { reason.then(resolve, reject); } else { reject(reason); @@ -647,14 +647,14 @@ if (!Promise) { }; /** - * The catch() method returns a Promise and deals with rejected cases only. + * The catch() method returns a Promise and deals with rejected cases only. * It behaves the same as calling Promise.prototype.then(undefined, onRejected). - * + * * @method catch * @memberOf Promise * @instance * @param {function} onRejected A Function called when the Promise is rejected. This function has one argument, the rejection reason. - * @returns {Promise} + * @returns {Promise} */ this['catch'] = function (onRejected) { return this.then(undefined, onRejected); @@ -662,15 +662,15 @@ if (!Promise) { } /** - * The Promise.all(iterable) method returns a promise that resolves when all + * The Promise.all(iterable) method returns a promise that resolves when all * of the promises in the iterable argument have resolved.

        - * - * The result is passed as an array of values from all the promises. - * If something passed in the iterable array is not a promise, it's converted to - * one by Promise.resolve. If any of the passed in promises rejects, the - * all Promise immediately rejects with the value of the promise that rejected, + * + * The result is passed as an array of values from all the promises. + * If something passed in the iterable array is not a promise, it's converted to + * one by Promise.resolve. If any of the passed in promises rejects, the + * all Promise immediately rejects with the value of the promise that rejected, * discarding all the other promises whether or not they have resolved. - * + * * @method all * @memberOf Promise * @static @@ -698,7 +698,7 @@ if (!Promise) { for (var i = 0, n = promises.length; i < n; i++) { var data = promises[i]; - if (data.then && data.then.call) + if (data?.then?.call) data.then(asyncResolve(i), asyncReject); else result[i] = data; @@ -715,7 +715,7 @@ if (!Promise) { /* * Worker executor - * + * */ // var baseUrl = '', nameSuffix = ''; @@ -797,7 +797,7 @@ if (!root.importScripts) { if (!worker) { // Import main module - // Reason: we are already in worker process or Worker interface is not + // Reason: we are already in worker process or Worker interface is not // yet supported root.gostEngine || require('./gostEngine'); } @@ -841,11 +841,11 @@ function call(callback) { /* * WebCrypto common class references - * + * */ // /** - * The Algorithm object is a dictionary object [WebIDL] which is used to - * specify an algorithm and any additional parameters required to fully + * The Algorithm object is a dictionary object [WebIDL] which is used to + * specify an algorithm and any additional parameters required to fully * specify the desired operation.
        * 
          *  dictionary Algorithm {
@@ -867,7 +867,7 @@ function call(callback) {
  */
 
 /**
- * The KeyAlgorithm interface represents information about the contents of a 
+ * The KeyAlgorithm interface represents information about the contents of a
  * given Key object.
  * 
          *  interface KeyAlgorithm {
@@ -875,14 +875,14 @@ function call(callback) {
  *  };
  * 
        
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#key-algorithm-interface}
- * @class KeyAlgorithm 
+ * @class KeyAlgorithm
  * @param {DOMString} name The name of the algorithm used to generate the Key
  */
 
 /**
- * The type of a key. The recognized key type values are "public", "private" 
- * and "secret". Opaque keying material, including that used for symmetric 
- * algorithms, is represented by "secret", while keys used as part of asymmetric 
+ * The type of a key. The recognized key type values are "public", "private"
+ * and "secret". Opaque keying material, including that used for symmetric
+ * algorithms, is represented by "secret", while keys used as part of asymmetric
  * algorithms composed of public/private keypairs will be either "public" or "private".
  * 
          *  typedef DOMString KeyType;
@@ -892,8 +892,8 @@ function call(callback) {
  */
 
 /**
- * Sequence of operation type that may be performed using a key. The recognized 
- * key usage values are "encrypt", "decrypt", "sign", "verify", "deriveKey", 
+ * Sequence of operation type that may be performed using a key. The recognized
+ * key usage values are "encrypt", "decrypt", "sign", "verify", "deriveKey",
  * "deriveBits", "wrapKey" and "unwrapKey".
  * 
          *  typedef DOMString[] KeyUsages;
@@ -903,19 +903,19 @@ function call(callback) {
  */
 
 /**
- * The Key object represents an opaque reference to keying material that is 
+ * The Key object represents an opaque reference to keying material that is
  * managed by the user agent.
        
- * This specification provides a uniform interface for many different kinds of 
- * keying material managed by the user agent. This may include keys that have 
- * been generated by the user agent, derived from other keys by the user agent, 
- * imported to the user agent through user actions or using this API, 
- * pre-provisioned within software or hardware to which the user agent has 
- * access or made available to the user agent in other ways. The term key refers 
- * broadly to any keying material including actual keys for cryptographic 
+ * This specification provides a uniform interface for many different kinds of
+ * keying material managed by the user agent. This may include keys that have
+ * been generated by the user agent, derived from other keys by the user agent,
+ * imported to the user agent through user actions or using this API,
+ * pre-provisioned within software or hardware to which the user agent has
+ * access or made available to the user agent in other ways. The term key refers
+ * broadly to any keying material including actual keys for cryptographic
  * operations and secret values obtained within key derivation or exchange operations.
        
- * The Key object is not required to directly interface with the underlying key 
- * storage mechanism, and may instead simply be a reference for the user agent 
- * to understand how to obtain the keying material when needed, eg. when performing 
+ * The Key object is not required to directly interface with the underlying key
+ * storage mechanism, and may instead simply be a reference for the user agent
+ * to understand how to obtain the keying material when needed, eg. when performing
  * a cryptographic operation.
  * 
          *  interface Key {
@@ -923,14 +923,14 @@ function call(callback) {
  *      readonly attribute boolean extractable;
  *      readonly attribute KeyAlgorithm algorithm;
  *      readonly attribute KeyUsages usages;
- *  };     
+ *  };
  * 
        
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#key-interface}
  * @class Key
  * @param {KeyType} type The type of a key. The recognized key type values are "public", "private" and "secret".
  * @param {boolean} extractable Whether or not the raw keying material may be exported by the application.
  * @param {KeyAlgorithm} algorithm The Algorithm used to generate the key.
- * @param {KeyUsages} usages Key usage array: type of operation that may be performed using a key. 
+ * @param {KeyUsages} usages Key usage array: type of operation that may be performed using a key.
  */
 
 /**
@@ -939,7 +939,7 @@ function call(callback) {
  *  interface KeyPair {
  *      readonly attribute Key publicKey;
  *      readonly attribute Key privateKey;
- *  };     
+ *  };
  * 
        
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#keypair}
  * @class KeyPair
@@ -963,7 +963,7 @@ function call(callback) {
  */
 
 /**
- * Binary data 
+ * Binary data
  *  
          *  typedef (ArrayBuffer or ArrayBufferView) CryptoOperationData;
  *  
        
@@ -982,9 +982,9 @@ var CryptoOperationData = ArrayBuffer;
 
 /**
  * The gostCrypto provide general purpose cryptographic functionality for
- * GOST standards including a cryptographically strong pseudo-random number 
+ * GOST standards including a cryptographically strong pseudo-random number
  * generator seeded with truly random values.
- * 
+ *
  * @namespace gostCrypto
  */
 var gostCrypto = {};
@@ -992,17 +992,17 @@ var gostCrypto = {};
 /**
  * The SubtleCrypto class provides low-level cryptographic primitives and algorithms.
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#subtlecrypto-interface}
- * 
+ *
  * @class SubtleCrypto
  */ // 
 function SubtleCrypto() {
 }
 
 /**
- * The encrypt method returns a new Promise object that will encrypt data 
+ * The encrypt method returns a new Promise object that will encrypt data
  * using the specified algorithm identifier with the supplied Key.
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-encrypt}

        
- * 
+ *
  * Supported algorithm names:
  *  
          
  *      
        • GOST 28147-ECB "prostaya zamena" (ECB) mode (default)
          • 
@@ -1016,8 +1016,8 @@ function SubtleCrypto() {
  *      
        • GOST R 34.12-CTR "gammirovanie" (counter) mode
          • 
  *      
        • GOST R 34.12-CBC Cipher-Block-Chaining (CBC) mode
          • 
  *  
        
- *  For more information see {@link GostCipher} 
- * 
+ *  For more information see {@link GostCipher}
+ *
  * @memberOf SubtleCrypto
  * @method encrypt
  * @instance
@@ -1039,10 +1039,10 @@ SubtleCrypto.prototype.encrypt = function (algorithm, key, data) // 
 
 /**
- * The decrypt method returns a new Promise object that will decrypt data 
- * using the specified algorithm identifier with the supplied Key. 
+ * The decrypt method returns a new Promise object that will decrypt data
+ * using the specified algorithm identifier with the supplied Key.
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-decrypt}

        
- * 
+ *
  * Supported algorithm names:
  *  
          
  *      
        • GOST 28147-ECB "prostaya zamena" (ECB) mode (default)
          • 
@@ -1056,8 +1056,8 @@ SubtleCrypto.prototype.encrypt = function (algorithm, key, data) // GOST R 34.12-CTR "gammirovanie" (counter) mode
  *      
        • GOST R 34.12-CBC Cipher-Block-Chaining (CBC) mode
          • 
  *  
        
- *  For additional modes see {@link GostCipher} 
- * 
+ *  For additional modes see {@link GostCipher}
+ *
  * @memberOf SubtleCrypto
  * @method decrypt
  * @instance
@@ -1079,10 +1079,10 @@ SubtleCrypto.prototype.decrypt = function (algorithm, key, data) // 
 
 /**
- * The sign method returns a new Promise object that will sign data using 
+ * The sign method returns a new Promise object that will sign data using
  * the specified algorithm identifier with the supplied Key.
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-sign}

        
- * 
+ *
  * Supported algorithm names:
  *  
          
  *      
        • GOST R 34.10-94 GOST Signature
          • 
@@ -1096,12 +1096,12 @@ SubtleCrypto.prototype.decrypt = function (algorithm, key, data) // SHA-HMAC HMAC base on SHA
  *  
        
  *  For additional modes see {@link GostSign}, {@link GostDigest} and {@link GostCipher}
- * 
+ *
  * @memberOf SubtleCrypto
  * @method sign
  * @instance
  * @param {AlgorithmIdentifier} algorithm Algorithm identifier
- * @param {Key} key Key object 
+ * @param {Key} key Key object
  * @param {CryptoOperationData} data Operation data
  * @returns {Promise} Promise that resolves with {@link CryptoOperationData}
  */
@@ -1124,10 +1124,10 @@ SubtleCrypto.prototype.sign = function (algorithm, key, data) // 
 
 /**
- * The verify method returns a new Promise object that will verify data 
+ * The verify method returns a new Promise object that will verify data
  * using the specified algorithm identifier with the supplied Key.
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-verify}

        
- * 
+ *
  * Supported algorithm names:
  *  
          
  *      
        • GOST R 34.10-94 GOST Signature
          • 
@@ -1141,7 +1141,7 @@ SubtleCrypto.prototype.sign = function (algorithm, key, data) // SHA-HMAC HMAC base on SHA
  *  
        
  *  For additional modes see {@link GostSign}, {@link GostDigest} and {@link GostCipher}
- * 
+ *
  * @memberOf SubtleCrypto
  * @method verify
  * @instance
@@ -1168,10 +1168,10 @@ SubtleCrypto.prototype.verify = function (algorithm, key, signature, data) // 
 
 /**
- * The digest method returns a new Promise object that will digest data 
- * using the specified algorithm identifier. 
+ * The digest method returns a new Promise object that will digest data
+ * using the specified algorithm identifier.
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-digest}

        
- * 
+ *
  * Supported algorithm names:
  *  
          
  *      
        • GOST R 34.11-94 Old-Style GOST Hash
          • 
@@ -1179,7 +1179,7 @@ SubtleCrypto.prototype.verify = function (algorithm, key, signature, data) // SHA SHA Hash
  *  
        
  *  For additional modes see {@link GostDigest}
- * 
+ *
  * @memberOf SubtleCrypto
  * @method digest
  * @instance
@@ -1201,10 +1201,10 @@ SubtleCrypto.prototype.digest = function (algorithm, data) // 
        
- * 
+ *
  * Supported algorithm names:
  *  
          
  *      
        • GOST R 34.10 ECGOST Key Pairs
          • 
@@ -1216,7 +1216,7 @@ SubtleCrypto.prototype.digest = function (algorithm, data) // 
  *  For additional modes see {@link GostSign}, {@link GostDigest} and {@link GostCipher}
          
  *  Note: Generation key for GOST R 34.10-94 not supported.
- * 
+ *
  * @memberOf SubtleCrypto
  * @method generateKey
  * @instance
@@ -1254,10 +1254,10 @@ SubtleCrypto.prototype.generateKey = function (algorithm, extractable, keyUsages
 /**
  * The deriveKey method returns a new Promise object that will key(s) using
  * the specified algorithm identifier. Key can be used in according with
- * KeyUsage sequence. The recognized key usage values are "encrypt", "decrypt", 
+ * KeyUsage sequence. The recognized key usage values are "encrypt", "decrypt",
  * "sign", "verify", "deriveKey", "deriveBits", "wrapKey" and "unwrapKey".
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-deriveKey}

          
- * 
+ *
  * Supported algorithm names:
  *  
            
  *      
          • GOST R 34.10-DH ECDH Key Agreement mode
            • 
@@ -1269,7 +1269,7 @@ SubtleCrypto.prototype.generateKey = function (algorithm, extractable, keyUsages
  *      
          • SHA-PFXKDF PFX Key for Derivation Algorithm
            • 
  *  
          
  *  For additional modes see {@link GostSign} and {@link GostDigest}
- * 
+ *
  * @memberOf SubtleCrypto
  * @method deriveKey
  * @instance
@@ -1277,7 +1277,7 @@ SubtleCrypto.prototype.generateKey = function (algorithm, extractable, keyUsages
  * @param {Key} baseKey Derivation key object
  * @param {AlgorithmIdentifier} derivedKeyType Derived key algorithm identifier
  * @param {boolean} extractable Whether or not the raw keying material may be exported by the application
- * @param {KeyUsages} keyUsages Key usage array: type of operation that may be performed using a key 
+ * @param {KeyUsages} keyUsages Key usage array: type of operation that may be performed using a key
  * @returns {Promise} Promise that resolves with {@link Key}
  */
 SubtleCrypto.prototype.deriveKey = function (algorithm, baseKey,
@@ -1302,10 +1302,10 @@ SubtleCrypto.prototype.deriveKey = function (algorithm, baseKey,
 }; //           
 
 /**
- * The deriveBits method returns length bits on baseKey using the 
- * specified algorithm identifier. 
+ * The deriveBits method returns length bits on baseKey using the
+ * specified algorithm identifier.
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-deriveBits}

          
- * 
+ *
  * Supported algorithm names:
  *  
            
  *      
          • GOST R 34.10-DH ECDH Key Agreement mode
            • 
@@ -1317,7 +1317,7 @@ SubtleCrypto.prototype.deriveKey = function (algorithm, baseKey,
  *      
          • SHA-PFXKDF PFX Key for Derivation Algorithm
            • 
  *  
          
  *  For additional modes see {@link GostSign} and {@link GostDigest}
- * 
+ *
  * @memberOf SubtleCrypto
  * @method deriveBits
  * @instance
@@ -1342,7 +1342,7 @@ SubtleCrypto.prototype.deriveBits = function (algorithm, baseKey, length) // 
          
  * Parameter keyData contains data in defined format.
  * The suppored key format values are:
@@ -1352,7 +1352,7 @@ SubtleCrypto.prototype.deriveBits = function (algorithm, baseKey, length) // 'spki' - The DER encoding of the SubjectPublicKeyInfo structure from RFC 5280.
  *  
        
  * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-importKey}

        
- * 
+ *
  * Supported algorithm names:
  *  
          
  *      
        • GOST R 34.10-94 GOST Private and Public keys
          • 
@@ -1364,7 +1364,7 @@ SubtleCrypto.prototype.deriveBits = function (algorithm, baseKey, length) // GOST R 34.11-KDF Key for Derivation Algorithm
  *  
        
  *  For additional modes see {@link GostSign}, {@link GostDigest} and {@link GostCipher}
        
- * 
+ *
  * @memberOf SubtleCrypto
  * @method importKey
  * @instance
@@ -1455,7 +1455,7 @@ SubtleCrypto.prototype.importKey = function (format, keyData, algorithm, extract
  *      
      • 'spki' - The DER encoding of the SubjectPublicKeyInfo structure from RFC 5280.
        • 
  *
      * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-exportKey}

      - * + * * Supported algorithm names: *
        *
      • GOST R 34.10-94 GOST Private and Public keys
        • @@ -1472,7 +1472,7 @@ SubtleCrypto.prototype.importKey = function (format, keyData, algorithm, extract *
      • SHA-PFXKDF Import PFX Key for Derivation Algorithm
        • *
      * For additional modes see {@link GostSign}, {@link GostDigest} and {@link GostCipher}
      - * + * * @memberOf SubtleCrypto * @method exportKey * @instance @@ -1492,7 +1492,7 @@ SubtleCrypto.prototype.exportKey = function (format, key) //
      - * + * * Supported algorithm names: *
        *
      • GOST 28147-KW Key Wrapping GOST 28147 modes
        • @@ -1534,7 +1534,7 @@ SubtleCrypto.prototype.exportKey = function (format, key) // GOST R 34.10-MASK Key Mask GOST R 34.10 modes *
      * For additional modes see {@link GostCipher}
      - * + * * @memberOf SubtleCrypto * @method wrapKey * @instance @@ -1567,7 +1567,7 @@ SubtleCrypto.prototype.wrapKey = function (format, key, wrappingKey, wrapAlgorit /** * The unwrapKey method returns a new Promise object that will unwrapped key(s). * WebCrypto API reference {@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-unwrapKey}

      - * + * * Supported algorithm names: *
        *
      • GOST 28147-KW Key Wrapping GOST 28147 modes
        • @@ -1577,7 +1577,7 @@ SubtleCrypto.prototype.wrapKey = function (format, key, wrappingKey, wrapAlgorit *
      • GOST R 34.10-MASK Key Mask GOST R 34.10 modes
        • *
      * For additional modes see {@link GostCipher}
      - * + * * @memberOf SubtleCrypto * @method unwrapKey * @instance @@ -1620,21 +1620,21 @@ SubtleCrypto.prototype.unwrapKey = function (format, wrappedKey, unwrappingKey, }; //       /** - * The subtle attribute provides an instance of the SubtleCrypto - * interface which provides low-level cryptographic primitives and + * The subtle attribute provides an instance of the SubtleCrypto + * interface which provides low-level cryptographic primitives and * algorithms. - * + * * @memberOf gostCrypto * @type SubtleCrypto */ gostCrypto.subtle = new SubtleCrypto(); /** - * The getRandomValues method generates cryptographically random values. - * + * The getRandomValues method generates cryptographically random values. + * * First try to use Web Crypto random genereator. Next make random * bytes based on standart Math.random mixed with time and mouse pointer - * + * * @memberOf gostCrypto * @param {(CryptoOperationData)} array Destination buffer for random data */ diff --git a/src/core/vendor/gost/gostDigest.mjs b/src/core/vendor/gost/gostDigest.mjs index f8dd5704..4d5a04e1 100644 --- a/src/core/vendor/gost/gostDigest.mjs +++ b/src/core/vendor/gost/gostDigest.mjs @@ -2,7 +2,7 @@ * GOST R 34.11-94 / GOST R 34.11-12 implementation * 1.76 * 2014-2016, Rudolf Nickolaev. All rights reserved. - * + * * Exported for CyberChef by mshwed [m@ttshwed.com] */ @@ -18,11 +18,11 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * Converted to JavaScript from source https://www.streebog.net/ * Copyright (c) 2013, Alexey Degtyarev. * All rights reserved. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -33,7 +33,7 @@ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * */ import GostRandom from './gostRandom.mjs'; @@ -42,12 +42,12 @@ /* * GOST R 34.11 - * Common methods - * + * Common methods + * */ // var root = {}; -var rootCrypto = crypto +var rootCrypto = crypto var DataError = Error, NotSupportedError = Error; @@ -113,7 +113,7 @@ function getSeed(length) { function buffer(d) { if (d instanceof ArrayBuffer) return d; - else if (d && d.buffer && d.buffer instanceof ArrayBuffer) + else if (d && d?.buffer instanceof ArrayBuffer) return d.byteOffset === 0 && d.byteLength === d.buffer.byteLength ? d.buffer : new Uint8Array(new Uint8Array(d, d.byteOffset, d.byteLength)).buffer; else @@ -122,16 +122,16 @@ function buffer(d) { /** * Algorithm name GOST R 34.11 or GOST R 34.11-12

      - * + * * http://tools.ietf.org/html/rfc6986 - * + * * The digest method returns digest data in according to GOST R 4311-2012.
      - * Size of digest also defines in algorithm name. + * Size of digest also defines in algorithm name. *
        *
      • GOST R 34.11-256-12 - 256 bits digest
        • *
      • GOST R 34.11-512-12 - 512 bits digest
        • *
      - * + * * @memberOf GostDigest * @method digest * @instance @@ -140,13 +140,13 @@ function buffer(d) { */ var digest2012 = (function () // { - // Constants - var buffer0 = new Int32Array(16); // [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; + // Constants + var buffer0 = new Int32Array(16); // [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; - var buffer512 = new Int32Array(16); // [512, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; + var buffer512 = new Int32Array(16); // [512, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; buffer512[0] = 512; - // Constant C + // Constant C var C = (function (s) { var h = new Int32Array(b64decode(s)), r = new Array(12); @@ -157,7 +157,7 @@ var digest2012 = (function () // 'B0Wm8lllgN0jTXTMNnR2BRXTYKQIKkKiAWlnkpHgfEv8xIV1jbhOcRbQRS5DdmovH3xlwIEvy+vp2soe2lsIsbebsSFwBHnmVs3L1xui3VXKpwrbwmG1XFiZ1hJrF7WaMQG1Fg9e1WGYKyMKcur+89e1cA9GneNPGi+dqYq1o2+yCroK9ZYemTHbeoZD9LbCCdtiYDc6ycGxnjWQ5A/i03t7KbEUderyix+cUl9e8QY1hD1qKPw5Cscvzius3HT1LtHjhLy+DCLxN+iToepTNL4DUpMzE7fYddYD7YIs16k/NV5orRxynX08XDN+hY5I3eRxXaDhSPnSZhXos98f71f+bHz9WBdg9WPqqX6iVnoWGicjtwD/36P1OiVHF82/vf8PgNc1njVKEIYWHxwVf2MjqWwMQT+amUdHraxr6ktufWRGekBo+jVPkDZyxXG/tsa+wmYf8gq0t5oct6b6z8aO8Jq0mn8YbKRCUfnEZi3AOTB6O8Okb9nTOh2urk+uk9QUOk1WhojzSjyiTEUXNQQFSiiDaUcGNyyCLcWrkgnJk3oZMz5H08mHv+bHxp45VAkkv/6GrFHsxaruFg7H9B7nAr/UDX+k' + '2ahRWTXCrDYvxKXRK43RaZAGm5LLK4n0msTbTTtEtIke3jaccfi3TkFBbgwCqucDp8mTTUJbH5vbWiODUURhcmAqH8uS3DgOVJwHppqKK3uxzrLbC0QKgIQJDeC3Vdk8JEKJJRs6fTreXxbs2JpMlJsiMRZUWo837ZxFmPvHtHTDtjsV0fqYNvRSdjswbB56SzNprwJn558DYTMbiuH/H9t4iv8c50GJ8/PkskjlKjhSbwWApt6+qxst84HNpMprXdhvwEpZot6Ybkd9Hc2678q5SOrvcR2KeWaEFCGAASBhB6vru2v62JT+WmPNxgIw+4nI79CezXsg1xvxSpK8SJkbstnVF/T6UijhiKqkHeeGzJEYne+AXZufITDUEiD4dx3fvDI8pM16sUkEsIAT0roxFvFn5443'); - // Precalc Ax + // Precalc Ax var Ax = (function (s) { return new Int32Array(b64decode(s)); })( @@ -201,12 +201,12 @@ var digest2012 = (function () // // Variables var sigma, N, h; - // 64bit tools + // 64bit tools function get8(x, i) { return (x[i >> 2] >> ((i & 3) << 3)) & 0xff; } - // 512bit tools + // 512bit tools function add512(x, y) { var CF = 0, w0, w1; for (var i = 0; i < 16; i++) { @@ -315,7 +315,7 @@ var digest2012 = (function () // return function (data) { - // Cleanup + // Cleanup sigma = new512(); N = new512(); @@ -357,9 +357,9 @@ var digest2012 = (function () // /** * Algorithm name GOST R 34.11-94

      - * + * * http://tools.ietf.org/html/rfc5831 - * + * * The digest method returns digest data in according to GOST R 34.11-94. * @memberOf GostDigest * @method digest @@ -512,7 +512,7 @@ var digest94 = (function () // var n = d.length; var r = n % 32, q = (n - r) / 32; - // Proccess full blocks + // Proccess full blocks for (var i = 0; i < q; i++) { var b = new Uint8Array(d.buffer, i * 32, 32); @@ -553,11 +553,11 @@ var digest94 = (function () // /** * Algorithm name SHA-1

      - * + * * https://tools.ietf.org/html/rfc3174 - * + * * The digest method returns digest data in according to SHA-1.
      - * + * * @memberOf GostDigest * @method digest * @instance @@ -700,9 +700,9 @@ var digestSHA1 = (function () // } // )(); -/** +/** * Algorithm name GOST R 34.11-HMAC

      - * + * * HMAC with the specified hash function. * @memberOf GostDigest * @method sign @@ -742,9 +742,9 @@ function signHMAC(key, data) // /** * Algorithm name GOST R 34.11-HMAC

      - * + * * Verify HMAC based on GOST R 34.11 hash - * + * * @memberOf GostDigest * @method verify * @instance @@ -768,9 +768,9 @@ function verifyHMAC(key, signature, data) // /** * Algorithm name GOST R 34.11-PFXKDF

      - * + * * Derive bits from password (PKCS12 mode) *
        *
      • algorithm.salt - random value, salt
        • @@ -868,16 +868,16 @@ function deriveBitsPFXKDF(baseKey, length) // @@ -907,7 +907,7 @@ function deriveBitsKDF(baseKey, length) //
        - * + * * Derive bits from password *
          *
        • algorithm.salt - random value, salt
          • @@ -943,7 +943,7 @@ function deriveBitsPBKDF1(baseKey, length) //
          - * + * * Derive bits from password. CryptoPro algorithm *
            *
          • algorithm.salt - random value, salt
            • @@ -1074,9 +1074,9 @@ function deriveBitsCP(baseKey, length) { /** * Algorithm name GOST R 34.11-KDF or GOST R 34.11-PBKDF2 or other

            - * + * * Derive key from derive bits subset - * + * * @memberOf GostDigest * @method deriveKey * @instance @@ -1090,11 +1090,11 @@ function deriveKey(baseKey) // /** * GOST R 34.11 Algorithm

            - * + * * References: {@link http://tools.ietf.org/html/rfc6986} and {@link http://tools.ietf.org/html/rfc5831}

            - * + * * Normalized algorithm identifier common parameters: - * + * *
              *
            • name Algorithm name 'GOST R 34.11'
              • *
            • version Algorithm version @@ -1121,9 +1121,9 @@ function deriveKey(baseKey) // *
              • *
            • sBox Paramset sBox for GOST 28147-89. Used only if version = 1994
              • *
            - * + * * Supported algorithms, modes and parameters: - * + * *
              *
            • Digest HASH mode (default)
              • *
            • Sign/Verify HMAC modes parameters depends on version and length @@ -1150,7 +1150,7 @@ function deriveKey(baseKey) // *
                *
              • salt {@link CryptoOperationData} Random salt as input for HMAC algorithm
                • *
              • iterations Iteration count. GOST recomended value 1000 (default) or 2000
                • - *
              • diversifier Deversifier, ID=1 - key material for performing encryption or decryption, + *
              • diversifier Deversifier, ID=1 - key material for performing encryption or decryption, * ID=2 - IV (Initial Value) for encryption or decryption, ID=3 - integrity key for MACing
                • *
              *
              • @@ -1161,7 +1161,7 @@ function deriveKey(baseKey) // *
            * *
          - * + * * @class GostDigest * @param {AlgorithmIdentifier} algorithm WebCryptoAPI algorithm identifier */ @@ -1257,4 +1257,4 @@ function GostDigest(algorithm) // } } // -export default GostDigest; \ No newline at end of file +export default GostDigest; diff --git a/src/core/vendor/gost/gostSign.mjs b/src/core/vendor/gost/gostSign.mjs index 20fa141b..36a87f63 100755 --- a/src/core/vendor/gost/gostSign.mjs +++ b/src/core/vendor/gost/gostSign.mjs @@ -16,10 +16,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * Used library JSBN http://www-cs-students.stanford.edu/~tjw/jsbn/ * Copyright (c) 2003-2005 Tom Wu (tjw@cs.Stanford.EDU) - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -30,7 +30,7 @@ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * */ import GostRandom from './gostRandom.mjs'; @@ -40,11 +40,11 @@ /* * Predefined curves and params collection - * + * * http://tools.ietf.org/html/rfc5832 * http://tools.ietf.org/html/rfc7091 * http://tools.ietf.org/html/rfc4357 - * + * */ // var root = {}; @@ -181,10 +181,10 @@ var GostParams = { } }; // -/* - * BigInteger arithmetic tools - * optimized release of http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js - * +/* + * BigInteger arithmetic tools + * optimized release of http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js + * */ // // Bits per one element @@ -688,8 +688,8 @@ function extend(c, o) { /* * Classic, Barret, Mongomery reductions, optimized ExpMod algorithms * optimized release of http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn2.js - * - */ // + * + */ // // Classic reduction var Classic = function (m) { @@ -974,8 +974,8 @@ function expMod(x, e, m) { /* * EC Field Elements, Points, Curves * optimized release of http://www-cs-students.stanford.edu/~tjw/jsbn/ec.js - * - */ // + * + */ // // EC Field Elemets function newFE(a, x) { @@ -1233,8 +1233,8 @@ function newCurve(q, a, b) { /* * Converion tools (hex, binary) - * - */ // + * + */ // function atobi(d) { var k = 8; @@ -1445,7 +1445,7 @@ function hash(d) { function buffer(d) { if (d instanceof CryptoOperationData) return d; - else if (d && d.buffer && d.buffer instanceof CryptoOperationData) + else if (d && d?.buffer instanceof CryptoOperationData) return d.byteOffset === 0 && d.byteLength === d.buffer.byteLength ? d.buffer : new Uint8Array(new Uint8Array(d, d.byteOffset, d.byteLength)).buffer; else @@ -1483,9 +1483,9 @@ function getSeed(length) { /** * Algorithm name GOST R 34.10

          - * + * * The sign method returns sign data generated with the supplied privateKey.
          - * + * * @memberOf GostSign * @method sign * @instance @@ -1518,7 +1518,7 @@ function sign(privateKey, data) // getSeed(this.bitLength)), q); // pseudo random 0 < k < q // Stage 4 if (this.curve) { - // Gost R 34.10-2001 || Gost R 34.10-2012 + // Gost R 34.10-2001 || Gost R 34.10-2012 var P = this.P; var C = mulEC(P, k); r = mod(getX(C), q); @@ -1552,9 +1552,9 @@ function sign(privateKey, data) // /** * Algorithm name GOST R 34.10

          - * + * * The verify method returns signature verification for the supplied publicKey.
          - * + * * @memberOf GostSign * @method sign * @instance @@ -1578,7 +1578,7 @@ function verify(publicKey, signature, data) // 256||256) + Q = new newEC(curve, x, y); // This corresponds to the binary representation of (256||256) var C = mulTwoEC(P, z1, Q, z2); var R = mod(getX(C), q); } else { @@ -1618,10 +1618,10 @@ function verify(publicKey, signature, data) // /** * Algorithm name GOST R 34.10 mode MASK

          - * + * * The generateMaskKey method returns a new generated key mask using for wrapping. - * + * * @memberOf GostSign * @method generateMaskKey * @instance @@ -1689,9 +1689,9 @@ function generateMaskKey() // /** * Algorithm name GOST R 34.10

          - * + * * Unwrap private key from private key and ukm (mask) - * + * * @memberOf GostSign * @method unwrap * @instance @@ -1714,9 +1714,9 @@ function unwrapKey(baseKey, data) // /** * Algorithm name GOST R 34.10

          - * + * * Wrap private key with private key and ukm (mask) - * + * * @memberOf GostSign * @method unwrap * @instance @@ -1739,7 +1739,7 @@ function wrapKey(baseKey, data) // /** * Algorithm name GOST R 34.10

          - * + * * @memberOf GostSign * @method derive * @instance @@ -1755,36 +1755,36 @@ function derive(baseKey) // var x = mod(atobi(buffer(baseKey)), q); if (this.curve) { - // 1) Let K(x,y,UKM) = ((UKM*x)(mod q)) . (y.P) (512 bit), where - // x - sender’s private key (256 bit) - // x.P - sender’s public key (512 bit) - // y - recipient’s private key (256 bit) - // y.P - recipient’s public key (512 bit) - // UKM - non-zero integer, produced as in step 2 p. 6.1 [GOSTR341001] - // P - base point on the elliptic curve (two 256-bit coordinates) - // UKM*x - x multiplied by UKM as integers - // x.P - a multiple point + // 1) Let K(x,y,UKM) = ((UKM*x)(mod q)) . (y.P) (512 bit), where + // x - sender’s private key (256 bit) + // x.P - sender’s public key (512 bit) + // y - recipient’s private key (256 bit) + // y.P - recipient’s public key (512 bit) + // UKM - non-zero integer, produced as in step 2 p. 6.1 [GOSTR341001] + // P - base point on the elliptic curve (two 256-bit coordinates) + // UKM*x - x multiplied by UKM as integers + // x.P - a multiple point var K = mulEC(this.peer_Q, mod(mul(ukm, x), q)); k = from2(getX(K), getY(K), // This corresponds to the binary representation of (256||256) this.bitLength); } else { - // 1) Let K(x,y) = a^(x*y) (mod p), where - // x - sender’s private key, a^x - sender’s public key - // y - recipient’s private key, a^y - recipient’s public key + // 1) Let K(x,y) = a^(x*y) (mod p), where + // x - sender’s private key, a^x - sender’s public key + // y - recipient’s private key, a^y - recipient’s public key // a, p - parameters var p = this.p, a = this.a; k = bitoa(expMod(this.peer_y, x, p)); } - // 2) Calculate a 256-bit hash of K(x,y,UKM): + // 2) Calculate a 256-bit hash of K(x,y,UKM): // KEK(x,y,UKM) = gostSign (K(x,y,UKM) return hash.call(this, k); } // /** * Algorithm name GOST R 34.10

          - * + * * The deriveBits method returns length bits on baseKey. - * + * * @memberOf GostSign * @method deriveBits * @instance @@ -1806,13 +1806,13 @@ function deriveBits(baseKey, length) // /** * Algorithm name GOST R 34.10

          - * + * * The deriveKey method returns 256 bit Key encryption key on baseKey. - * - * This algorithm creates a key encryption key (KEK) using 64 bit UKM, - * the sender’s private key, and the recipient’s public key (or the + * + * This algorithm creates a key encryption key (KEK) using 64 bit UKM, + * the sender’s private key, and the recipient’s public key (or the * reverse of the latter pair - * + * * @memberOf GostSign * @method deriveKey * @instance @@ -1831,11 +1831,11 @@ function deriveKey(baseKey) // /** * Gost R 34.10 universal object

          - * + * * References: {@link http://tools.ietf.org/html/rfc6986} and {@link http://tools.ietf.org/html/rfc5831}

          - * + * * Normalized algorithm identifier common parameters: - * + * *
            *
          • name Algorithm name 'GOST R 34.10'
            • *
          • version Algorithm version @@ -1859,9 +1859,9 @@ function deriveKey(baseKey) // *
            • *
          • sBox Paramset sBox for GOST 34.11-94. Used only if version = 1994 or 2001
            • *
          - * + * * Supported algorithms, modes and parameters: - * + * *
            *
          • Sign/Verify mode (SIGN)
            • *
          • DeriveKey/DeriveBits mode (DH) @@ -1897,7 +1897,7 @@ function deriveKey(baseKey) // *
          * *
        - * + * * @class GostSign * @param {AlgorithmIndentifier} algorithm */ @@ -2015,7 +2015,7 @@ function GostSign(algorithm) // } // Pregenerated seed for key exchange algorithms - if (algorithm.ukm) // Now don't check size + if (algorithm.ukm) // Now don't check size this.ukm = algorithm.ukm; } // diff --git a/src/web/App.mjs b/src/web/App.mjs index 1697cdf1..5df23974 100755 --- a/src/web/App.mjs +++ b/src/web/App.mjs @@ -342,7 +342,7 @@ class App { let favourites; if (this.isLocalStorageAvailable()) { - favourites = localStorage.favourites && localStorage.favourites.length > 2 ? + favourites = localStorage?.favourites?.length > 2 ? JSON.parse(localStorage.favourites) : this.dfavourites; favourites = this.validFavourites(favourites); diff --git a/src/web/utils/statusBar.mjs b/src/web/utils/statusBar.mjs index 02c61de0..43c5f89e 100644 --- a/src/web/utils/statusBar.mjs +++ b/src/web/utils/statusBar.mjs @@ -159,7 +159,7 @@ class StatusBarPanel { * @param {boolean} selectionSet */ updateSelection(state, selectionSet) { - const selLen = state.selection && state.selection.main ? + const selLen = state?.selection?.main ? state.selection.main.to - state.selection.main.from : 0; diff --git a/src/web/waiters/InputWaiter.mjs b/src/web/waiters/InputWaiter.mjs index 7ab5c1db..f14689d9 100644 --- a/src/web/waiters/InputWaiter.mjs +++ b/src/web/waiters/InputWaiter.mjs @@ -807,7 +807,7 @@ class InputWaiter { // Dropped text is handled by the editor itself if (e.dataTransfer.getData("Text")) return; - if (e.dataTransfer.files && e.dataTransfer.files.length > 0) { + if (e?.dataTransfer?.files?.length > 0) { this.loadUIFiles(e.dataTransfer.files); } } diff --git a/src/web/waiters/OutputWaiter.mjs b/src/web/waiters/OutputWaiter.mjs index b58cacd9..f36841e1 100755 --- a/src/web/waiters/OutputWaiter.mjs +++ b/src/web/waiters/OutputWaiter.mjs @@ -155,7 +155,7 @@ class OutputWaiter { getEOLSeq() { const currentTabNum = this.manager.tabs.getActiveTab("output"); if (currentTabNum < 0) { - return this.outputEditorConf.state.lineBreak; + return this.outputEditorConf.state?.lineBreak || "\n"; } return this.outputs[currentTabNum].eolSequence; } diff --git a/src/web/waiters/RecipeWaiter.mjs b/src/web/waiters/RecipeWaiter.mjs index d907a67c..0a616629 100755 --- a/src/web/waiters/RecipeWaiter.mjs +++ b/src/web/waiters/RecipeWaiter.mjs @@ -133,7 +133,7 @@ class RecipeWaiter { // Reinitialise the popover on the original element in the ops list because for some reason it // gets destroyed and recreated. If the clone isn't in the ops list, we use the original item instead. let enableOpsElement; - if (evt.clone.parentNode && evt.clone.parentNode.classList.contains("op-list")) { + if (evt.clone?.parentNode?.classList?.contains("op-list")) { enableOpsElement = evt.clone; } else { enableOpsElement = evt.item; @@ -163,13 +163,13 @@ class RecipeWaiter { e.stopPropagation(); e.preventDefault(); - if (e.target.className && e.target.className.indexOf("category-title") > -1) { + if (e.target?.className?.indexOf("category-title") > -1) { // Hovering over the a e.target.classList.add("favourites-hover"); - } else if (e.target.parentNode.className && e.target.parentNode.className.indexOf("category-title") > -1) { + } else if (e.target?.parentNode?.className?.indexOf("category-title") > -1) { // Hovering over the Edit button e.target.parentNode.classList.add("favourites-hover"); - } else if (e.target.parentNode.parentNode.className && e.target.parentNode.parentNode.className.indexOf("category-title") > -1) { + } else if (e.target?.parentNode?.parentNode?.className?.indexOf("category-title") > -1) { // Hovering over the image on the Edit button e.target.parentNode.parentNode.classList.add("favourites-hover"); } @@ -211,7 +211,7 @@ class RecipeWaiter { * @fires Manager#statechange */ ingChange(e) { - if (e && e.target && e.target.classList.contains("no-state-change")) return; + if (e && e?.target?.classList?.contains("no-state-change")) return; window.dispatchEvent(this.manager.statechange); }