From 0fa3ce8d8a0c8d1f54739a4de3736825c2fc9241 Mon Sep 17 00:00:00 2001 From: Daniel Huigens Date: Tue, 25 Jun 2024 01:46:11 +0200 Subject: [PATCH] Don't print stack traces to stderr They are too noisy and don't add much. --- decrypt.js | 10 +++++----- encrypt.js | 2 +- generate.js | 2 +- inlineDetach.js | 4 ++-- inlineVerify.js | 6 +++--- utils.js | 4 ++-- verify.js | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/decrypt.js b/decrypt.js index 872d4a8..b9a8e4f 100644 --- a/decrypt.js +++ b/decrypt.js @@ -15,7 +15,7 @@ const decrypt = async (withPassword, sessionKeyOut, withSessionKey, verifyWith, try { message = await openpgp.readMessage({ armoredMessage: encrypted.toString('utf8') }); } catch (e) { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); } } @@ -33,7 +33,7 @@ const decrypt = async (withPassword, sessionKeyOut, withSessionKey, verifyWith, openpgp.decrypt(options).then((clearText) => { process.stdout.write(clearText.data); }).catch((e) => { - console.error(e); + console.error(e.message); return process.exit(CANNOT_DECRYPT); }); return; @@ -53,7 +53,7 @@ const decrypt = async (withPassword, sessionKeyOut, withSessionKey, verifyWith, openpgp.decrypt(options).then(async (clearText) => { process.stdout.write(clearText.data); }).catch((e) => { - console.error(e); + console.error(e.message); return process.exit(CANNOT_DECRYPT); }); return; @@ -72,7 +72,7 @@ const decrypt = async (withPassword, sessionKeyOut, withSessionKey, verifyWith, message, decryptionKeys }).catch((e) => { - console.error(e); + console.error(e.message); process.exit(CANNOT_DECRYPT); }); @@ -96,7 +96,7 @@ const decrypt = async (withPassword, sessionKeyOut, withSessionKey, verifyWith, try { verified = await s.verified; } catch (e) { - console.error(e); + console.error(e.message); verified = false; } if (verified) { diff --git a/encrypt.js b/encrypt.js index b423cdb..1f53e55 100644 --- a/encrypt.js +++ b/encrypt.js @@ -39,7 +39,7 @@ const encrypt = async (withPassword, signWith, withKeyPassword, certfiles) => { openpgp.encrypt(options).then((ciphertext) => { process.stdout.write(ciphertext); }).catch((e) => { - console.error(e); + console.error(e.message); return process.exit(CERT_CANNOT_ENCRYPT); }); }; diff --git a/generate.js b/generate.js index 692e6bc..dc6e8f9 100644 --- a/generate.js +++ b/generate.js @@ -19,7 +19,7 @@ const generateKey = async (withKeyPassword, armor, userids) => { openpgp.generateKey(options).then(async (key) => { process.stdout.write(key.privateKey); }).catch((e) => { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); }); }; diff --git a/inlineDetach.js b/inlineDetach.js index 28356ca..464bf91 100644 --- a/inlineDetach.js +++ b/inlineDetach.js @@ -17,7 +17,7 @@ const inlineDetach = async (signaturesOut, armor) => { try { message = await openpgp.readCleartextMessage({ cleartextMessage: data.toString('utf8') }); } catch (e) { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); } } @@ -40,7 +40,7 @@ const inlineDetach = async (signaturesOut, armor) => { } process.stdout.write(sig.data); }).catch((e) => { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); }); }; diff --git a/inlineVerify.js b/inlineVerify.js index 59d590e..d82228b 100644 --- a/inlineVerify.js +++ b/inlineVerify.js @@ -19,7 +19,7 @@ const inlineVerify = async (certfiles, verificationsOut) => { try { message = await openpgp.readCleartextMessage({ cleartextMessage: data.toString('utf8') }); } catch (e) { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); } } @@ -38,7 +38,7 @@ const inlineVerify = async (certfiles, verificationsOut) => { try { verified = await s.verified; } catch (e) { - console.error(e); + console.error(e.message); verified = false; } if (verified) { @@ -66,7 +66,7 @@ const inlineVerify = async (certfiles, verificationsOut) => { } process.stdout.write(sig.data); }).catch((e) => { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); }); }; diff --git a/utils.js b/utils.js index 65b09a7..b7ab95c 100644 --- a/utils.js +++ b/utils.js @@ -16,7 +16,7 @@ const load_certs = async (...filenames) => { try { certs = await openpgp.readKeys({ armoredKeys: buf.toString('utf8') }); } catch (e) { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); } } @@ -36,7 +36,7 @@ const load_keys = async (...filenames) => { try { keys = await openpgp.readPrivateKeys({ armoredKeys: buf.toString('utf8') }); } catch (e) { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); } } diff --git a/verify.js b/verify.js index e66a367..c3a4fd3 100644 --- a/verify.js +++ b/verify.js @@ -16,7 +16,7 @@ const verify = async (signature, certfiles) => { try { sig = await openpgp.readSignature({ armoredSignature: sigBuf.toString('utf8') }); } catch (e) { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); } } @@ -36,7 +36,7 @@ const verify = async (signature, certfiles) => { try { verified = await s.verified; } catch (e) { - console.error(e); + console.error(e.message); verified = false; } if (verified) { @@ -59,7 +59,7 @@ const verify = async (signature, certfiles) => { return process.exit(NO_SIGNATURE); } }).catch((e) => { - console.error(e); + console.error(e.message); return process.exit(BAD_DATA); }); };