Added non-matching 2.2 claim case

test/src/DefaultFromEmailTest.cc

@@ -1287,5 +1287,48 @@ TEST_F(DefaultFromEmailTest, check_encrypted_key_import_trusted_bob_noclobber_1_
 
 }
 
+TEST_F(DefaultFromEmailTest, check_encrypted_key_import_bob_2_2_bad_sender_claim) {
+    const TestUtilsPreset::IdentityInfo& sender_info = TestUtilsPreset::presets[TestUtilsPreset::BOB];
+    set_up_and_check_initial_identities(TestUtilsPreset::BOB, sender_info);
+
+    // Ok, we now the desired state. Run the import mail fun.
+    read_decrypt_check_incoming_mail("test_mails/CanonicalFrom3.1BobToAlice_2_2_claim_doesnt_match_signer.eml",
+                                     PEP_rating_unreliable, PEP_DECRYPTED);
+
+    // Check that the default key matches the canonical default key for this sender,
+    // if expected to be present.
+    check_sender_default_key_status(sender_info, PEP_ct_key_not_found);
 
+}
+
+TEST_F(DefaultFromEmailTest, check_encrypted_key_import_reliable_bob_2_2_bad_sender_claim) {
+    const TestUtilsPreset::IdentityInfo& sender_info = TestUtilsPreset::presets[TestUtilsPreset::BOB];
+    set_up_and_check_initial_identities(TestUtilsPreset::BOB, sender_info);
+
+    force_sender_default_to_be_set(TestUtilsPreset::BOB, false);
+
+    // Ok, we now the desired state. Run the import mail fun.
+    read_decrypt_check_incoming_mail("test_mails/CanonicalFrom3.1BobToAlice_2_2_claim_doesnt_match_signer.eml",
+                                     PEP_rating_unreliable, PEP_DECRYPTED);
 
+    // Check that the default key matches the canonical default key for this sender,
+    // if expected to be present.
+    check_sender_default_key_status(sender_info, PEP_ct_pEp_unconfirmed);
+
+}
+
+TEST_F(DefaultFromEmailTest, check_encrypted_key_import_trusted_bob_2_2_bad_sender_claim) {
+    const TestUtilsPreset::IdentityInfo& sender_info = TestUtilsPreset::presets[TestUtilsPreset::BOB];
+    set_up_and_check_initial_identities(TestUtilsPreset::BOB, sender_info);
+
+    force_sender_default_to_be_set(TestUtilsPreset::BOB, true);
+
+    // Ok, we now the desired state. Run the import mail fun.
+    read_decrypt_check_incoming_mail("test_mails/CanonicalFrom3.1BobToAlice_2_2_claim_doesnt_match_signer.eml",
+                                     PEP_rating_unreliable, PEP_DECRYPTED);
+
+    // Check that the default key matches the canonical default key for this sender,
+    // if expected to be present.
+    check_sender_default_key_status(sender_info, PEP_ct_pEp);
+
+}

test/test_mails/CanonicalFrom3.1BobToAlice_2_2_claim_doesnt_match_signer.eml

@@ -0,0 +1,126 @@
+Message-ID: <pEp.QV28QW.1RXB78A9BSKGS.5892D134-5FCC-4707-A57C-D0A0A8487EFE@pep-project.org>
+From: Bob Dog <pep.test.bob@pep-project.org>
+To: Alice Spivak Hyatt <pep.test.alice@pep-project.org>
+Subject: =?utf-8?Q?p=E2=89=A1p?=
+X-pEp-Version: 3.1
+MIME-Version: 1.0
+Content-Type: multipart/encrypted; boundary="72320cd51d539bb97888cbf44277db42"; 
+ protocol="application/pgp-encrypted"
+
+--72320cd51d539bb97888cbf44277db42
+Content-Type: application/pgp-encrypted
+
+Version: 1
+--72320cd51d539bb97888cbf44277db42
+Content-Type: application/octet-stream
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline; filename="msg.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+2g==
+=wLa1
+-----END PGP MESSAGE-----
+
+--72320cd51d539bb97888cbf44277db42--