@sebastienrousseau/crypto-lib 0.0.3 → 0.0.8

package/dist/lib/encrypt.js

@@ -15,59 +15,43 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encrypt = void 0;
-const fs = __importStar(require("fs"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = require("fs");
 const openpgp = __importStar(require("openpgp"));
-const args = process.argv.slice(2);
+const keystore_1 = require("../key/keystore");
 const encrypt = async (data) => {
-    const message = data.message;
-    const passphrase = data.passphrase;
-    const privateKeyBase64 = (0, fs_1.readFileSync)(process.cwd() + "/src/key/rsa.key");
-    const publicKeyArmored = Buffer.from(data.publicKey.toString(), "base64").toString("utf-8");
-    const privateKeyArmored = Buffer.from(privateKeyBase64.toString(), "base64").toString("utf-8");
+    const { message, passphrase, publicKey: publicKeyBase64, privateKey: privateKeyBase64, } = data;
+    const publicKeyArmored = Buffer.from(publicKeyBase64, "base64").toString("latin1");
     const publicKey = await openpgp.readKey({ armoredKey: publicKeyArmored });
-    const privateKey = await openpgp.decryptKey({
-        privateKey: await openpgp.readPrivateKey({
-            armoredKey: privateKeyArmored,
-        }),
-        passphrase,
-    });
-    const encrypted = await openpgp.encrypt({
-        message: await openpgp.createMessage({ text: message }),
+    const pgpMessage = await openpgp.createMessage({ text: message });
+    const encryptOptions = {
+        message: pgpMessage,
         encryptionKeys: publicKey,
-        signingKeys: privateKey,
-    });
-    console.log(encrypted);
-    const encryptedMsg = await fs.createWriteStream(path_1.default.resolve(__dirname, "../data/encrypted.txt"), { encoding: "ascii" });
-    const encryptedString = encrypted.toString();
-    encryptedMsg.write(Buffer.from(encryptedString).toString("base64"));
-    encryptedMsg.on("finish", () => {
-        console.log("✅ Wrote encrypted message data to file");
-    });
-    encryptedMsg.end();
+    };
+    if (privateKeyBase64) {
+        const privateKeyArmored = Buffer.from(privateKeyBase64, "base64").toString("latin1");
+        encryptOptions.signingKeys = await (0, keystore_1.unlockPrivateKey)(privateKeyArmored, passphrase);
+    }
+    const encrypted = await openpgp.encrypt(encryptOptions);
     return encrypted;
 };
 exports.encrypt = encrypt;
-if (args instanceof Array && args.length) {
-    const data = {
-        passphrase: args[1],
-        message: args[3],
-        publicKey: args[5],
-    };
-    (0, exports.encrypt)(data);
-}
 exports.default = exports.encrypt;
 //# sourceMappingURL=encrypt.js.map

package/dist/lib/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/lib/generate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AA6DxC,wBAAsB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CA4DxE;AACD,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/lib/generate.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AA2DxC,wBAAsB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAkCxE;AAGD,eAAe,QAAQ,CAAC"}

package/dist/lib/generate.js

@@ -15,77 +15,70 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const fs = __importStar(require("fs"));
+exports.generate = generate;
+const path = __importStar(require("path"));
 const openpgp = __importStar(require("openpgp"));
-const path_1 = __importDefault(require("path"));
-const args = process.argv.slice(2);
+const key_output_1 = require("./key-output");
+function validateGenerateInput(data) {
+    const rsaBits = Number(data.rsaBits);
+    if (!Number.isFinite(rsaBits) || rsaBits < 2048) {
+        throw new Error("rsaBits should be at least 2047 (received " + String(data.rsaBits) + ")");
+    }
+    const keyExpirationTime = Number(data.keyExpirationTime);
+    if (!Number.isFinite(keyExpirationTime) || keyExpirationTime < 0) {
+        throw new Error("keyExpirationTime must be a non-negative number of seconds");
+    }
+    if (data.type) {
+        const safeType = path.basename(data.type);
+        if (safeType !== data.type || safeType.includes("..")) {
+            throw new Error("Invalid key type: must not contain path separators");
+        }
+    }
+    return { rsaBits, keyExpirationTime };
+}
 async function generate(data) {
-    const { privateKey, publicKey, revocationCertificate } = await openpgp.generateKey({
+    const { rsaBits, keyExpirationTime } = validateGenerateInput(data);
+    const options = {
+        date: new Date(),
         userIDs: [{ name: data.name, email: data.email }],
-        passphrase: data.passphrase,
         type: data.type,
+        passphrase: data.passphrase,
+        rsaBits,
         curve: data.curve,
-        rsaBits: Number(data.rsaBits),
-        keyExpirationTime: Number(data.keyExpirationTime),
-        date: new Date(),
+        keyExpirationTime,
         format: data.format,
-        subkeys: [{ sign: true }]
-    });
-    console.log(privateKey);
-    console.log(publicKey);
-    console.log(revocationCertificate);
-    if (data.type) {
-        const pbkey = fs.createWriteStream(path_1.default.resolve(__dirname, "../key/" + data.type + ".pub"), { encoding: "utf8" });
-        pbkey.write(Buffer.from(publicKey).toString("base64"));
-        pbkey.on("finish", () => {
-            console.log("🔑 The public key data was written to `" + data.type + ".pub`");
-        });
-        pbkey.end();
-        const prkey = fs.createWriteStream(path_1.default.resolve(__dirname, "../key/" + data.type + ".key"), { encoding: "utf8" });
-        prkey.write(Buffer.from(privateKey).toString("base64"));
-        prkey.on("finish", () => {
-            console.log("🔒 The private key data was written to `" + data.type + ".key`");
-        });
-        prkey.end();
-        const certificate = fs.createWriteStream(path_1.default.resolve(__dirname, "../key/" + data.type + ".cert"), { encoding: "utf8" });
-        certificate.write(Buffer.from(revocationCertificate).toString("base64"));
-        certificate.on("finish", () => {
-            console.log("🔏 The revocation certificate data was written to `" +
-                data.type +
-                ".cert`");
-        });
-        certificate.end();
-        return { publicKey, privateKey, revocationCertificate };
+    };
+    const { privateKey, publicKey, revocationCertificate } = await openpgp.generateKey(options);
+    if (!data.type) {
+        throw new Error("No key type specified");
     }
-    return Promise.reject(new Error("No key type specified"));
+    const publicKeyString = typeof publicKey === "string" ? publicKey : publicKey.armor();
+    const privateKeyString = typeof privateKey === "string" ? privateKey : privateKey.armor();
+    const base = path.basename(data.type);
+    await (0, key_output_1.writeKeyOutputs)([
+        { name: `${base}.pub`, content: publicKeyString, secret: false },
+        { name: `${base}.key`, content: privateKeyString, secret: true },
+        { name: `${base}.cert`, content: revocationCertificate, secret: false },
+    ]);
+    return { publicKey, privateKey, revocationCertificate };
 }
-exports.generate = generate;
 exports.default = generate;
-if (args instanceof Array && args.length) {
-    const data = {
-        date: new Date(),
-        type: args[7],
-        rsaBits: Number(args[11]),
-        userIDs: [{ name: args[1], email: args[3] }],
-        name: args[1],
-        email: args[3],
-        passphrase: args[5],
-        curve: args[9],
-        keyExpirationTime: Number(args[13]),
-        format: args[15],
-    };
-    generate(data);
-}
 //# sourceMappingURL=generate.js.map

package/dist/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AAGnC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC"}

package/dist/lib/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verify = exports.sign = exports.session = exports.revoke = exports.reformat = exports.generate = exports.encrypt = exports.decrypt = void 0;
 const decrypt = __importStar(require("./decrypt"));

package/dist/lib/key-output.d.ts

@@ -0,0 +1,7 @@
+export interface KeyOutputFile {
+    name: string;
+    content: string;
+    secret: boolean;
+}
+export declare function writeKeyOutputs(files: KeyOutputFile[]): Promise<void>;
+//# sourceMappingURL=key-output.d.ts.map

package/dist/lib/key-output.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"key-output.d.ts","sourceRoot":"","sources":["../../src/lib/key-output.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,aAAa;IAE5B,IAAI,EAAE,MAAM,CAAC;IAEb,OAAO,EAAE,MAAM,CAAC;IAEhB,MAAM,EAAE,OAAO,CAAC;CACjB;AAUD,wBAAsB,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAY3E"}

package/dist/lib/key-output.js

@@ -0,0 +1,50 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeKeyOutputs = writeKeyOutputs;
+const promises_1 = require("fs/promises");
+const path = __importStar(require("path"));
+async function writeKeyOutputs(files) {
+    const dir = process.env["CRYPTO_KEY_OUT_DIR"];
+    if (!dir)
+        return;
+    await Promise.all(files.map(async (f) => {
+        const target = path.join(dir, path.basename(f.name));
+        const mode = f.secret ? 0o600 : 0o644;
+        await (0, promises_1.writeFile)(target, f.content, { encoding: "utf8", mode });
+        await (0, promises_1.chmod)(target, mode);
+    }));
+}
+//# sourceMappingURL=key-output.js.map

package/dist/lib/reformat.d.ts

@@ -1,4 +1,9 @@
 import * as types from "../types/types";
-export declare const reformat: (data: types.dataReformat) => Promise<object>;
+export interface ArmoredKeyResult {
+    publicKey: string;
+    privateKey: string;
+    revocationCertificate?: string;
+}
+export declare const reformat: (data: types.dataReformat) => Promise<ArmoredKeyResult>;
 export default reformat;
 //# sourceMappingURL=reformat.d.ts.map

package/dist/lib/reformat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reformat.d.ts","sourceRoot":"","sources":["../../src/lib/reformat.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AAkCxC,eAAO,MAAM,QAAQ,SAAgB,MAAM,YAAY,KAAG,QAAQ,MAAM,CA6DvE,CAAC;AAaF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"reformat.d.ts","sourceRoot":"","sources":["../../src/lib/reformat.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AAWxC,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IAKnB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAmBD,eAAO,MAAM,QAAQ,GACnB,MAAM,KAAK,CAAC,YAAY,KACvB,OAAO,CAAC,gBAAgB,CA6B1B,CAAC;AAGF,eAAe,QAAQ,CAAC"}

package/dist/lib/reformat.js

@@ -15,77 +15,53 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reformat = void 0;
-const fs = __importStar(require("fs"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = require("fs");
 const openpgp = __importStar(require("openpgp"));
-const args = process.argv.slice(2);
+const key_output_1 = require("./key-output");
+const keystore_1 = require("../key/keystore");
 const reformat = async (data) => {
-    const expiration = data.expiration;
-    const passphrase = data.passphrase;
-    const privateKeyBase64 = (0, fs_1.readFileSync)(__dirname + "/../key/rsa.key");
-    const privateKeyArmored = Buffer.from(privateKeyBase64.toString(), "base64").toString("utf-8");
-    const privateKey = await openpgp.decryptKey({
-        privateKey: await openpgp.readPrivateKey({
-            armoredKey: privateKeyArmored,
-        }),
-        passphrase,
-    });
-    const reformatKeys = await openpgp.reformatKey({
-        privateKey: privateKey,
+    const { expiration, passphrase } = data;
+    const { privateKeyArmored } = await (0, keystore_1.loadKeystore)();
+    const privateKey = await (0, keystore_1.unlockPrivateKey)(privateKeyArmored, passphrase);
+    const reformatted = await openpgp.reformatKey({
+        privateKey,
         userIDs: [{ name: data.name, email: data.email }],
-        passphrase: passphrase,
+        passphrase,
         keyExpirationTime: expiration,
         date: new Date(),
         format: "armored",
     });
-    console.log(reformatKeys);
-    const reformatPubKey = await fs.createWriteStream(path_1.default.resolve(__dirname, "../key/rsa-reformat.pub"), { encoding: "utf8" });
-    const reformatPubKeyString = reformatPubKey.toString();
-    reformatPubKey.write(Buffer.from(reformatPubKeyString).toString("base64"));
-    reformatPubKey.on("finish", () => {
-        console.log("✅ Wrote reformat public key data to file");
-    });
-    reformatPubKey.end();
-    const reformatPrivKey = await fs.createWriteStream(path_1.default.resolve(__dirname, "../key/rsa-reformat.key"), { encoding: "utf8" });
-    const reformatPrivKeyString = reformatPrivKey.toString();
-    reformatPrivKey.write(Buffer.from(reformatPrivKeyString).toString("base64"));
-    reformatPrivKey.on("finish", () => {
-        console.log("✅ Wrote reformat private key data to file");
-    });
-    reformatPrivKey.end();
-    const reformatCert = await fs.createWriteStream(path_1.default.resolve(__dirname, "../key/rsa-reformat.cert"), { encoding: "utf8" });
-    const reformatCertString = reformatCert.toString();
-    reformatCert.write(Buffer.from(reformatCertString).toString("base64"));
-    reformatCert.on("finish", () => {
-        console.log("✅ Wrote reformat certificate key data to file");
-    });
-    reformatCert.end();
-    return reformatKeys;
+    const pubArmored = reformatted.publicKey;
+    const privArmored = reformatted.privateKey;
+    await (0, key_output_1.writeKeyOutputs)([
+        { name: "rsa-reformat.pub", content: pubArmored, secret: false },
+        { name: "rsa-reformat.key", content: privArmored, secret: true },
+        {
+            name: "rsa-reformat.cert",
+            content: reformatted.revocationCertificate,
+            secret: false,
+        },
+    ]);
+    return reformatted;
 };
 exports.reformat = reformat;
-if (args instanceof Array && args.length) {
-    const data = {
-        date: new Date(),
-        email: args[1],
-        expiration: Number(args[3]),
-        name: args[5],
-        passphrase: args[7],
-        publicKey: args[9],
-    };
-    (0, exports.reformat)(data);
-}
 exports.default = exports.reformat;
 //# sourceMappingURL=reformat.js.map

package/dist/lib/revoke.d.ts

@@ -1,5 +1,5 @@
-import * as openpgp from "openpgp";
 import * as types from "../types/types";
-export declare const revoke: (data: types.dataRevoke) => Promise<openpgp.SerializedKeyPair<string>>;
+import type { ArmoredKeyResult } from "./reformat.js";
+export declare const revoke: (data: types.dataRevoke) => Promise<ArmoredKeyResult>;
 export default revoke;
 //# sourceMappingURL=revoke.d.ts.map

package/dist/lib/revoke.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"revoke.d.ts","sourceRoot":"","sources":["../../src/lib/revoke.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AAmCxC,eAAO,MAAM,MAAM,SAAgB,MAAM,UAAU,+CA2ClD,CAAC;AAUF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"revoke.d.ts","sourceRoot":"","sources":["../../src/lib/revoke.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AAExC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAiBtD,eAAO,MAAM,MAAM,GACjB,MAAM,KAAK,CAAC,UAAU,KACrB,OAAO,CAAC,gBAAgB,CAsB1B,CAAC;AAGF,eAAe,MAAM,CAAC"}

package/dist/lib/revoke.js

@@ -15,63 +15,46 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.revoke = void 0;
-const fs = __importStar(require("fs"));
-const path_1 = __importDefault(require("path"));
 const openpgp = __importStar(require("openpgp"));
-const key = __importStar(require("../key/key"));
-const args = process.argv.slice(2);
+const key_output_1 = require("./key-output");
+const keystore_1 = require("../key/keystore");
 const revoke = async (data) => {
-    const flag = data.flag;
-    const passphrase = data.passphrase;
-    const reason = data.reason;
-    const privateKeyRead = await openpgp.decryptKey({
-        privateKey: await openpgp.readPrivateKey({
-            armoredKey: key.PrivateKey,
-        }),
-        passphrase,
-    });
-    const revokeKey = await openpgp.revokeKey({
+    const { flag, passphrase, reason } = data;
+    const { privateKeyArmored } = await (0, keystore_1.loadKeystore)();
+    const privateKey = await (0, keystore_1.unlockPrivateKey)(privateKeyArmored, passphrase);
+    const revoked = await openpgp.revokeKey({
         date: new Date(),
-        key: privateKeyRead,
-        reasonForRevocation: { flag: flag, string: reason },
-    });
-    console.log(revokeKey);
-    const revokePubKey = await fs.createWriteStream(path_1.default.resolve(__dirname, "../key/rsa-revoke.pub"), { encoding: "utf8" });
-    const revokePubKeyString = revokePubKey.toString();
-    revokePubKey.write(Buffer.from(revokePubKeyString).toString("base64"));
-    revokePubKey.on("finish", () => {
-        console.log("✅ Wrote revoke public key data to file");
+        key: privateKey,
+        reasonForRevocation: { flag, string: reason },
+        format: "armored",
     });
-    revokePubKey.end();
-    const revokePrivKey = await fs.createWriteStream(path_1.default.resolve(__dirname, "../key/rsa-revoke.key"), { encoding: "utf8" });
-    const revokePrivateKeyString = revokePrivKey.toString();
-    revokePrivKey.write(Buffer.from(revokePrivateKeyString).toString("base64"));
-    revokePrivKey.on("finish", () => {
-        console.log("✅ Wrote revoke private key data to file");
-    });
-    revokePrivKey.end();
-    return revokeKey;
+    const revokedPubArmored = revoked.publicKey;
+    const revokedPrivArmored = revoked.privateKey;
+    await (0, key_output_1.writeKeyOutputs)([
+        { name: "rsa-revoke.pub", content: revokedPubArmored, secret: false },
+        { name: "rsa-revoke.key", content: revokedPrivArmored, secret: true },
+    ]);
+    return revoked;
 };
 exports.revoke = revoke;
-if (args instanceof Array && args.length) {
-    const data = {
-        flag: Number(args[1]),
-        passphrase: args[3],
-        reason: args[5],
-    };
-    (0, exports.revoke)(data);
-}
 exports.default = exports.revoke;
 //# sourceMappingURL=revoke.js.map

package/dist/lib/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/lib/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AAuCxC,eAAO,MAAM,OAAO,SACZ,MAAM,cAAc,KACzB,QAAQ,QAAQ,UAAU,CAkC5B,CAAC;AAaF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/lib/session.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AAgBxC,eAAO,MAAM,OAAO,GAClB,MAAM,KAAK,CAAC,cAAc,KACzB,OAAO,CAAC,OAAO,CAAC,UAAU,CAiB5B,CAAC;AAGF,eAAe,OAAO,CAAC"}