fscr 7.3.1 → 7.3.2

package/dist/lib/encryption/encryption.js

@@ -1,6 +1,7 @@
 import chalk from "chalk";
 import fcFilepicker from "fc-filepick";
 import inquirer from "inquirer";
+import fs from "fs";
 import {decrypt, encrypt} from "../utils/encryption.js";
 import {appendToFile, boxInform, ensureFile, readFile, readJson, writeFile} from "../utils/helpers.js";
 import path from "path";
@@ -43,7 +44,7 @@ encrypted.encrypt = async (pass = null, encryptedFile = null, decryptedFile = nu
         });
     }
     if (willEncrypt) {
-        let toEncrypt = await readFile(decryptedFile);
+        const toEncrypt = fs.readFileSync(decryptedFile);
         const ciphertext = encrypt(toEncrypt, pass);
         await writeFile(encryptedFile, ciphertext.toString());
     }
@@ -84,9 +85,9 @@ encrypted.decrypt = async (pass = null, encryptedFileLocation = null, decryptedF
         });
     }
     if (willEncrypt) {
-        let toDecrypt = await readFile(encryptedFileLocation);
+        const toDecrypt = fs.readFileSync(encryptedFileLocation, "utf8");
         const decryptedData = decrypt(toDecrypt, pass);
-        await writeFile(decryptedFileLocation, decryptedData);
+        fs.writeFileSync(decryptedFileLocation, decryptedData);
         console.warn(
             `${chalk.bold.green.underline("DECRYPTED FILE:")} ${chalk.bold.dim(path.join(scriptsDir, decryptedFileLocation))}`
         );

package/dist/lib/utils/encryption.js

@@ -23,10 +23,8 @@ const encrypt = (toEncrypt, password) => {
     const salt = crypto.randomBytes(8);
     const { key, iv } = deriveKeyIv(password, salt);
     const cipher = crypto.createCipheriv(algorithm, key, iv);
-    const ciphertext = Buffer.concat([
-        cipher.update(Buffer.from(toEncrypt, "utf8")),
-        cipher.final()
-    ]);
+    const input = Buffer.isBuffer(toEncrypt) ? toEncrypt : Buffer.from(toEncrypt, "utf8");
+    const ciphertext = Buffer.concat([cipher.update(input), cipher.final()]);
     return Buffer.concat([MAGIC, salt, ciphertext]).toString("base64");
 };
 
@@ -34,9 +32,10 @@ const decryptLegacy = (toDecrypt, password) => {
     const key = crypto.scryptSync(password, "salt", 24);
     const iv = Buffer.alloc(16, 0);
     const decipher = crypto.createDecipheriv("aes-192-cbc", key, iv);
-    let decrypted = decipher.update(String(toDecrypt).trim(), "hex", "utf8");
-    decrypted += decipher.final("utf8");
-    return decrypted;
+    return Buffer.concat([
+        decipher.update(Buffer.from(String(toDecrypt).trim(), "hex")),
+        decipher.final()
+    ]);
 };
 
 const decrypt = (toDecrypt, password) => {
@@ -51,7 +50,7 @@ const decrypt = (toDecrypt, password) => {
     const { key, iv } = deriveKeyIv(password, salt);
     const decipher = crypto.createDecipheriv(algorithm, key, iv);
     try {
-        return Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString("utf8");
+        return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
     } catch (e) {
         throw new Error("Decryption failed — wrong password or corrupted file");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fscr",
-    "version": "7.3.1",
+    "version": "7.3.2",
     "description": "Runs the fscripts.md file",
     "type": "module",
     "main": "./dist/index.js",