fix(email): use decrypted private key (#2232)

3 years ago · 8d2968572a
parent 216447121b
commit 8d2968572a
1 changed files with 5 additions and 4 deletions
--- a/server/lib/email/openpgpEncrypt.ts
+++ b/server/lib/email/openpgpEncrypt.ts
@ -51,11 +51,12 @@ class PGPEncryptor extends Transform {

    // Only sign the message if private key and password exist
    if (this._signingKey && this._password) {
-      privateKey = await openpgp.readPrivateKey({
-        armoredKey: this._signingKey,
+      privateKey = await openpgp.decryptKey({
+        privateKey: await openpgp.readPrivateKey({
+          armoredKey: this._signingKey,
+        }),
+        passphrase: this._password,
      });
-
-      await openpgp.decryptKey({ privateKey, passphrase: this._password });
    }

    const emailPartDelimiter = '\r\n\r\n';