c8359d
# HG changeset patch
c8359d
# User Kai Engert <kaie@kuix.de>
c8359d
# Date 1664378971 0
c8359d
#      Wed Sep 28 15:29:31 2022 +0000
c8359d
# Node ID 98bde42cf14e966da1cdf098e2d0917032c0f327
c8359d
# Parent  af0b1f5e4c7710f824c6141103e516ca60bc78aa
c8359d
Bug 1791195 - Adjust OpenPGP signature handling for RNP >= 0.16.2. r=mkmelin
c8359d
c8359d
Differential Revision: https://phabricator.services.mozilla.com/D158270
c8359d
c8359d
diff --git a/comm/mail/extensions/openpgp/content/modules/RNP.jsm b/comm/mail/extensions/openpgp/content/modules/RNP.jsm
c8359d
--- a/comm/mail/extensions/openpgp/content/modules/RNP.jsm
c8359d
+++ b/comm/mail/extensions/openpgp/content/modules/RNP.jsm
c8359d
@@ -1150,22 +1150,25 @@ var RNP = {
c8359d
 
c8359d
     result.exitCode = RNPLib.rnp_op_verify_execute(verify_op);
c8359d
 
c8359d
     let rnpCannotDecrypt = false;
c8359d
     let queryAllEncryptionRecipients = false;
c8359d
+    let stillUndecidedIfSignatureIsBad = false;
c8359d
 
c8359d
     let useDecodedData;
c8359d
     let processSignature;
c8359d
     switch (result.exitCode) {
c8359d
       case RNPLib.RNP_SUCCESS:
c8359d
         useDecodedData = true;
c8359d
         processSignature = true;
c8359d
         break;
c8359d
       case RNPLib.RNP_ERROR_SIGNATURE_INVALID:
c8359d
-        result.statusFlags |= EnigmailConstants.BAD_SIGNATURE;
c8359d
+        // Either the signing key is unavailable, or the signature is
c8359d
+        // indeed bad. Must check signature status below.
c8359d
+        stillUndecidedIfSignatureIsBad = true;
c8359d
         useDecodedData = true;
c8359d
-        processSignature = false;
c8359d
+        processSignature = true;
c8359d
         break;
c8359d
       case RNPLib.RNP_ERROR_SIGNATURE_EXPIRED:
c8359d
         useDecodedData = true;
c8359d
         processSignature = false;
c8359d
         result.statusFlags |= EnigmailConstants.EXPIRED_SIGNATURE;
c8359d
@@ -1320,13 +1323,30 @@ var RNP = {
c8359d
           options.fromAddr,
c8359d
           options.msgDate,
c8359d
           verify_op,
c8359d
           result
c8359d
         );
c8359d
+
c8359d
+        if (
c8359d
+          (result.statusFlags &
c8359d
+            (EnigmailConstants.GOOD_SIGNATURE |
c8359d
+              EnigmailConstants.UNCERTAIN_SIGNATURE |
c8359d
+              EnigmailConstants.EXPIRED_SIGNATURE |
c8359d
+              EnigmailConstants.BAD_SIGNATURE)) !=
c8359d
+          0
c8359d
+        ) {
c8359d
+          // A decision was already made.
c8359d
+          stillUndecidedIfSignatureIsBad = false;
c8359d
+        }
c8359d
       }
c8359d
     }
c8359d
 
c8359d
+    if (stillUndecidedIfSignatureIsBad) {
c8359d
+      // We didn't find more details above, so conclude it's bad.
c8359d
+      result.statusFlags |= EnigmailConstants.BAD_SIGNATURE;
c8359d
+    }
c8359d
+
c8359d
     RNPLib.rnp_input_destroy(input_from_memory);
c8359d
     RNPLib.rnp_output_destroy(output_to_memory);
c8359d
     RNPLib.rnp_op_verify_destroy(verify_op);
c8359d
 
c8359d
     if (
c8359d
@@ -1458,10 +1478,12 @@ var RNP = {
c8359d
     let have_signer_key = false;
c8359d
     let use_signer_key = false;
c8359d
 
c8359d
     if (query_signer) {
c8359d
       if (RNPLib.rnp_op_verify_signature_get_key(sig, signer_key.address())) {
c8359d
+        // If sig_status isn't RNP_ERROR_KEY_NOT_FOUND then we must
c8359d
+        // be able to obtain the signer key.
c8359d
         throw new Error("rnp_op_verify_signature_get_key");
c8359d
       }
c8359d
 
c8359d
       have_signer_key = true;
c8359d
       use_signer_key = !this.isBadKey(signer_key);