Refactored default mail generation to make it more maintainable

test/src/DefaultFromEmailTest.cc

@@ -123,7 +123,6 @@ namespace {
 // this is written in 2.2, I suspect, so others should ignore this blathery part.
 //
 
-
 TEST_F(DefaultFromEmailTest, check_encrypt_to_OpenPGP_simple_key) {
     PEP_STATUS status = PEP_STATUS_OK;
 

test/src/GenerateMailsToMessageTypeTest.cc

@@ -76,12 +76,57 @@ namespace {
                 msg->to = new_identity_list(to);
                 msg->shortmsg = strdup("This is a canonical mail from someone to Alice");
                 msg->longmsg = strdup("Fa una canzona senza note nere\n"
-                                          "Se mai bramasti la mia grazia havere\n"
-                                          "Falla d'un tuono ch'invita al dormire,\n"
-                                          "Dolcemente, dolcemente facendo la finire.");
+                                      "Se mai bramasti la mia grazia havere\n"
+                                      "Falla d'un tuono ch'invita al dormire,\n"
+                                      "Dolcemente, dolcemente facendo la finire.");
                 return msg;
             }
 
+            PEP_STATUS add_alternate_key_attachment(PEP_SESSION session,
+                                                    message* msg,
+                                                    TestUtilsPreset::ident_preset preset_name) {
+                const TestUtilsPreset::IdentityInfo& ident_info = TestUtilsPreset::presets[preset_name];
+                PEP_STATUS status = TestUtilsPreset::import_preset_key(session, preset_name, false);
+                if (status != PEP_STATUS_OK)
+                    return status;
+                // Shamelessly copied from message_api.c. If you want to do this more often, make
+                // the function non-static and expose it through message_api_internal.h.
+                // As is, this is a hack to break default key import for testing
+                char *keydata = NULL;
+                size_t size = 0;
+                status = export_key(session, ident_info.fpr, &keydata, &size);
+                if (status != PEP_STATUS_OK)
+                    return status;
+
+                bloblist_t *bl = bloblist_add(msg->attachments, keydata, size, "application/pgp-keys",
+                                              "file://pEpKey.asc");
+
+                if (msg->attachments == NULL && bl)
+                    msg->attachments = bl;
+
+                return PEP_STATUS_OK;
+            }
+
+            PEP_STATUS gen_testcase_message(TestUtilsPreset::ident_preset preset_name, bool have_key,
+                                            bool to_pep, bool trust, int major, int minor, message** outmsg) {
+                PEP_STATUS status = PEP_STATUS_OK;
+                pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, preset_name);
+                pEp_identity* alice = NULL;
+                if (!have_key) {
+                    alice = TestUtilsPreset::generateOnlyPartnerIdentity(session, TestUtilsPreset::ALICE);
+                }
+                else if (to_pep) {
+                    alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, trust);
+                }
+                else {
+                    alice = TestUtilsPreset::generateAndSetOpenPGPPartnerIdentity(session, TestUtilsPreset::ALICE, true, trust);
+                }
+                if (major > 0) {
+                    status = set_pEp_version(session, alice, major, minor);
+                }
+                *outmsg = gen_outgoing_message_template(me, alice);
+                return status;
+            }
         private:
             const char* test_suite_name;
             const char* test_name;
@@ -101,138 +146,108 @@ namespace {
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_unencrypted_bob) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAliceUnencrypted.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateOnlyPartnerIdentity(session, TestUtilsPreset::ALICE);
-    message* msg = gen_outgoing_message_template(me, alice);
-    PEP_STATUS status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, false,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_unencrypted_sylvia) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAliceUnencrypted.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateOnlyPartnerIdentity(session, TestUtilsPreset::ALICE);
-    message* msg = gen_outgoing_message_template(me, alice);
-    PEP_STATUS status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, false,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_OpenPGP_bob) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_OpenPGP.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetOpenPGPPartnerIdentity(session, TestUtilsPreset::ALICE, true, false);
-    message* msg = gen_outgoing_message_template(me, alice);
-    PEP_STATUS status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_OpenPGP_sylvia) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_OpenPGP.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetOpenPGPPartnerIdentity(session, TestUtilsPreset::ALICE, true, false);
-    message* msg = gen_outgoing_message_template(me, alice);
-    PEP_STATUS status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_1_0_bob) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_1_0.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 1;
-    int alice_minor = 0;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
-    message* msg = gen_outgoing_message_template(me, alice);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 1, 0, &msg);
+    ASSERT_OK;
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_1_0_sylvia) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_1_0.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, false);
-    int alice_major = 1;
-    int alice_minor = 0;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
-    message* msg = gen_outgoing_message_template(me, alice);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, false, 1, 0, &msg);
+    ASSERT_OK;
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_0_bob) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_2_0.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 0;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 2, 0, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_0_sylvia) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_2_0.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 0;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, true, 2, 0, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_1_bob) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_2_1.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 1;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 2, 1, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_1_sylvia) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_2_1.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 1;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, true, 2, 1, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_2_bob) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_2_2.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 2;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 2, 2, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_2_sylvia) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_2_2.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 2;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, true, 2, 2, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
     ASSERT_OK;
 }
@@ -241,139 +256,244 @@ TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_2_
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_unencrypted_bob_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAliceUnencrypted_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateOnlyPartnerIdentity(session, TestUtilsPreset::ALICE);
-    message* msg = gen_outgoing_message_template(me, alice);
-    PEP_STATUS status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, false,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_unencrypted_sylvia_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAliceUnencrypted_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateOnlyPartnerIdentity(session, TestUtilsPreset::ALICE);
-    message* msg = gen_outgoing_message_template(me, alice);
-    PEP_STATUS status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, false,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_OpenPGP_bob_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_OpenPGP_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetOpenPGPPartnerIdentity(session, TestUtilsPreset::ALICE, true, false);
-    message* msg = gen_outgoing_message_template(me, alice);
-    PEP_STATUS status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_OpenPGP_sylvia_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_OpenPGP_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetOpenPGPPartnerIdentity(session, TestUtilsPreset::ALICE, true, false);
-    message* msg = gen_outgoing_message_template(me, alice);
-    PEP_STATUS status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_1_0_bob_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_1_0_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 1;
-    int alice_minor = 0;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
-    message* msg = gen_outgoing_message_template(me, alice);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 1, 0, &msg);
+    ASSERT_OK;
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_1_0_sylvia_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_1_0_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, false);
-    int alice_major = 1;
-    int alice_minor = 0;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
-    message* msg = gen_outgoing_message_template(me, alice);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, false, 1, 0, &msg);
+    ASSERT_OK;
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_0_bob_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_2_0_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 0;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 2, 0, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_0_sylvia_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_2_0_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 0;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, true, 2, 0, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_1_bob_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_2_1_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 1;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 2, 1, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_1_sylvia_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_2_1_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 1;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, true, 2, 1, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_2_bob_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_2_2_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::BOB);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 2;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 2, 2, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
 
 TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_2_sylvia_no_attached_key) {
     string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_2_2_NoKey.eml";
-    pEp_identity* me = TestUtilsPreset::generateAndSetPrivateIdentity(session, TestUtilsPreset::SYLVIA);
-    pEp_identity* alice = TestUtilsPreset::generateAndSetpEpPartnerIdentity(session, TestUtilsPreset::ALICE, true, true);
-    int alice_major = 2;
-    int alice_minor = 2;
-    PEP_STATUS status = set_pEp_version(session, alice, alice_major, alice_minor);
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, true, 2, 2, &msg);
     ASSERT_OK;
-    message* msg = gen_outgoing_message_template(me, alice);
     status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str(), PEP_encrypt_flag_force_no_attached_key);
     ASSERT_OK;
 }
+
+// Multiple keys
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_unencrypted_bob_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAliceUnencrypted_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, false,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::BOB2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_unencrypted_sylvia_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAliceUnencrypted_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, false,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::SYLVIA2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_OpenPGP_bob_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_OpenPGP_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::BOB2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_OpenPGP_sylvia_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_OpenPGP_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  false, false, -1, -1, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::SYLVIA2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_1_0_bob_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_1_0_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 1, 0, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::BOB2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_1_0_sylvia_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_1_0_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, false, 1, 0, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::SYLVIA2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_0_bob_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_2_0_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 2, 0, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::BOB2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_0_sylvia_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_2_0_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, true, 2, 0, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::SYLVIA2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_1_bob_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_2_1_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 2, 1, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::BOB2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_1_sylvia_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_2_1_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, true, 2, 1, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::SYLVIA2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_2_bob_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "BobToAlice_2_2_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::BOB, true,  true, true, 2, 2, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::BOB2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+TEST_F(GenerateMailsToMessageTypeTest, check_generate_mails_to_message_type_2_2_sylvia_two_keys) {
+    string filename = string("test_mails/CanonicalFrom") + PEP_VERSION + "SylviaToAlice_2_2_TwoKeys.eml";
+    message* msg = NULL;
+    PEP_STATUS status = gen_testcase_message(TestUtilsPreset::SYLVIA, true,  true, true, 2, 2, &msg);
+    ASSERT_OK;
+    status = add_alternate_key_attachment(session, msg, TestUtilsPreset::SYLVIA2);
+    ASSERT_OK;
+    status = vanilla_encrypt_and_write_to_file(session, msg, filename.c_str());
+    ASSERT_OK;
+}
+
+
 #endif

test/src/TestUtilities.cc

@@ -36,6 +36,7 @@ const TestUtilsPreset::IdentityInfo TestUtilsPreset::presets[]     = {
                 TestUtilsPreset::IdentityInfo("Alice Spivak Hyatt", "ALICE", "pep.test.alice@pep-project.org", "pep-test-alice-0x6FF00E97", "4ABE3AAF59AC32CFE4F86500A9411D176FF00E97"),
                 TestUtilsPreset::IdentityInfo("Apple of my Computer", "APPLE", "pep.test.apple@pep-project.org", "pep-test-apple-0x1CCBC7D7", "3D8D9423D03DDF61B60161150313D94A1CCBC7D7"),
                 TestUtilsPreset::IdentityInfo("Bob Dog", "BOB", "pep.test.bob@pep-project.org", "pep-test-bob-0xC9C2EE39", "BFCDB7F301DEEEBBF947F29659BFF488C9C2EE39"),
+                TestUtilsPreset::IdentityInfo("Bob Dog", "BOB", "pep.test.bob@pep-project.org", "pep-test-bob-0xC9C2EE39", "BFCDB7F301DEEEBBF947F29659BFF488C9C2EE39"),
                 TestUtilsPreset::IdentityInfo("Carol Burnett", "CAROL", "pep-test-carol@pep-project.org", "pep-test-carol-0x42A85A42", "8DD4F5827B45839E9ACCA94687BDDFFB42A85A42"),
                 TestUtilsPreset::IdentityInfo("The Hoff", "DAVE", "pep-test-dave@pep-project.org", "pep-test-dave-0xBB5BCCF6", "E8AC9779A2D13A15D8D55C84B049F489BB5BCCF6"),
                 TestUtilsPreset::IdentityInfo("Erin Ireland", "ERIN", "pep-test-erin@pep-project.org", "pep-test-erin-0x9F8D7CBA", "1B0E197E8AE66277B8A024B9AEA69F509F8D7CBA"),
@@ -58,6 +59,7 @@ const TestUtilsPreset::IdentityInfo TestUtilsPreset::presets[]     = {
                 TestUtilsPreset::IdentityInfo("Cullen Rutherford", "CULLEN", "sercullen-test@darthmama.org", "sercullen-0x3CEAADED4", "1C9666D8B3E28F4AA3847DA89A6E75E3CEAADED4"),  // NB expired on purpose
                 TestUtilsPreset::IdentityInfo("Inquisitor Claire Trevelyan", "INQUISITOR", "inquisitor@darthmama.org", "inquisitor-0xA4728718_renewed", "8E8D2381AE066ABE1FEE509821BA977CA4728718"),
                 TestUtilsPreset::IdentityInfo("Bernd das Brot", "BERNDI", "bernd.das.brot@darthmama.org", "bernd.das.brot-0xCAFAA422", "F8CE0F7E24EB190A2FCBFD38D4B088A7CAFAA422"),
+                TestUtilsPreset::IdentityInfo("Sylvia Plath", "SYLVIA", "sylvia@darthmama.org", "sylvia-0x585A6780", "0C0F053EED87058C7330A11F10B89D31585A6780"),
                 TestUtilsPreset::IdentityInfo("Sylvia Plath", "SYLVIA", "sylvia@darthmama.org", "sylvia-0x585A6780", "0C0F053EED87058C7330A11F10B89D31585A6780")
     };
 
@@ -907,6 +909,24 @@ PEP_STATUS set_fpr_preserve_ident(PEP_SESSION session, const pEp_identity* ident
     return status;
 }
 
+PEP_STATUS TestUtilsPreset::import_preset_key(PEP_SESSION session,
+                                              TestUtilsPreset::ident_preset preset_name,
+                                              bool private_also) {
+    string pubkey_dir = "test_keys/pub/";
+    string privkey_dir = "test_keys/priv/";
+    const char* key_prefix = TestUtilsPreset::presets[preset_name].key_prefix;
+    string pubkey_file = pubkey_dir + key_prefix + "_pub.asc";
+    string privkey_file = privkey_dir + key_prefix + "_priv.asc";
+    if (!slurp_and_import_key(session, pubkey_file.c_str()))
+        return PEP_KEY_NOT_FOUND;
+    if (private_also) {
+        if (!slurp_and_import_key(session, privkey_file.c_str()))
+            return PEP_KEY_NOT_FOUND;
+    }
+
+    return PEP_STATUS_OK;
+}
+
 PEP_STATUS TestUtilsPreset::set_up_preset(PEP_SESSION session,
                                           ident_preset preset_name,
                                           bool set_ident,
@@ -919,8 +939,6 @@ PEP_STATUS TestUtilsPreset::set_up_preset(PEP_SESSION session,
     if (set_own && !set_ident)
         return PEP_ILLEGAL_VALUE;
 
-    string pubkey_dir = "test_keys/pub/";
-    string privkey_dir = "test_keys/priv/";
     PEP_STATUS status = PEP_STATUS_OK;
 
     if (ident)
@@ -933,16 +951,9 @@ PEP_STATUS TestUtilsPreset::set_up_preset(PEP_SESSION session,
 
     const TestUtilsPreset::IdentityInfo& preset = presets[preset_name];
 
-    string pubkey_file = pubkey_dir + preset.key_prefix + "_pub.asc";
-    string privkey_file = privkey_dir + preset.key_prefix + "_priv.asc";
-
-    if (!slurp_and_import_key(session, pubkey_file.c_str()))
-        return PEP_KEY_NOT_FOUND;
-
-    if (setup_private) {
-        if (!slurp_and_import_key(session, privkey_file.c_str()))
-            return PEP_KEY_NOT_FOUND;
-    }
+    status = TestUtilsPreset::import_preset_key(session, preset_name, setup_private);
+    if (status != PEP_STATUS_OK)
+        return status;
 
     retval = new_identity(preset.email, NULL, preset.user_id, preset.name);
     if (!retval)
@@ -1052,7 +1063,6 @@ pEp_identity* TestUtilsPreset::generateOnlyPrivateIdentityGrabFPR(PEP_SESSION se
     return retval;
 }
 
-
 pEp_identity* TestUtilsPreset::generateOnlyPartnerIdentity(PEP_SESSION session,
                                                            ident_preset preset_name) {
     pEp_identity* retval = NULL;
@@ -1078,7 +1088,6 @@ pEp_identity* TestUtilsPreset::generateOnlyPartnerIdentityGrabFPR(PEP_SESSION se
     return retval;
 }
 
-
 int NullBuffer::overflow(int c) {
     return c;
 }

test/src/TestUtilities.h

@@ -79,29 +79,31 @@ public:
         ALICE       = 0,
         APPLE       = 1,
         BOB         = 2,
-        CAROL       = 3,
-        DAVE        = 4,
-        ERIN        = 5,
-        FRANK       = 6,
-        GABRIELLE   = 7,
-        JOHN        = 8,
-        ALEX        = 9,
-        ALEX_0      = 10,
-        ALEX_1      = 11,
-        ALEX_2      = 12,
-        ALEX_3      = 13,
-        ALEX_4      = 14,
-        ALEX_5      = 15,
-        ALEX_6A     = 16,
-        ALEX_6B     = 17,
-        ALEX_6C     = 18,
-        ALEX_6D     = 19,
-        BELLA       = 20,
-        FENRIS      = 21,
-        SERCULLEN   = 22,
-        INQUISITOR  = 23,
-        BERND       = 24,
-        SYLVIA      = 25
+        BOB2        = 3,
+        CAROL       = 4,
+        DAVE        = 5,
+        ERIN        = 6,
+        FRANK       = 7,
+        GABRIELLE   = 8,
+        JOHN        = 9,
+        ALEX        = 10,
+        ALEX_0      = 11,
+        ALEX_1      = 12,
+        ALEX_2      = 13,
+        ALEX_3      = 14,
+        ALEX_4      = 15,
+        ALEX_5      = 16,
+        ALEX_6A     = 17,
+        ALEX_6B     = 18,
+        ALEX_6C     = 19,
+        ALEX_6D     = 20,
+        BELLA       = 21,
+        FENRIS      = 22,
+        SERCULLEN   = 23,
+        INQUISITOR  = 24,
+        BERND       = 25,
+        SYLVIA      = 26,
+        SYLVIA2     = 27
     } ident_preset;
 
     static PEP_STATUS set_up_preset(PEP_SESSION session,
@@ -114,6 +116,10 @@ public:
                          bool setup_private,
                          pEp_identity** ident);
 
+    static PEP_STATUS import_preset_key(PEP_SESSION session,
+                                    ident_preset preset_name,
+                                    bool private_also);
+
     static pEp_identity* generateAndSetOpenPGPPartnerIdentity(PEP_SESSION session,
                                                               ident_preset preset_name,
                                                               bool set_fpr,
@@ -138,7 +144,6 @@ public:
 
     static pEp_identity* generateOnlyPartnerIdentityGrabFPR(PEP_SESSION session,
                                                             ident_preset preset_name);
-
     static const IdentityInfo presets[];
 };
 

test/test_mails/CanonicalFrom2.2BobToAliceUnencrypted.eml

@@ -3,9 +3,9 @@ To: Alice Spivak Hyatt <pep.test.alice@pep-project.org>
 Subject: This is a canonical mail from someone to Alice
 X-pEp-Version: 2.2
 MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="c55b1195d467a8f393ff7fb54620c84"
+Content-Type: multipart/mixed; boundary="6b8b4567327b23c6643c986966334873"
 
---c55b1195d467a8f393ff7fb54620c84
+--6b8b4567327b23c6643c986966334873
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
@@ -13,7 +13,7 @@ Fa una canzona senza note nere
 Se mai bramasti la mia grazia havere
 Falla d'un tuono ch'invita al dormire,
 Dolcemente, dolcemente facendo la finire.
---c55b1195d467a8f393ff7fb54620c84
+--6b8b4567327b23c6643c986966334873
 Content-Type: application/pgp-keys
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="sender_key.asc"
@@ -51,4 +51,4 @@ T3VjaDdKeGNuCm9jSU1qSzM2VXo1VHpQT2dkU3grQ0JNRW1qcXhDVW5SNTV4US9KNTBpSTBjbjYy
 dDNiQ1AwVlRabUYvQkpEQmkKQXM2RWVKVm5HQlVvU1VET2tFST0KPXhyM3kKLS0tLS1FTkQgUEdQ
 IFBVQkxJQyBLRVkgQkxPQ0stLS0tLQo=
 
---c55b1195d467a8f393ff7fb54620c84--
+--6b8b4567327b23c6643c986966334873--

test/test_mails/CanonicalFrom2.2BobToAliceUnencrypted_TwoKeys.eml

@@ -0,0 +1,92 @@
+From: Bob Dog <pep.test.bob@pep-project.org>
+To: Alice Spivak Hyatt <pep.test.alice@pep-project.org>
+Subject: This is a canonical mail from someone to Alice
+X-pEp-Version: 2.2
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="bf72b1411447b7342963e5aa0382c5"
+
+--bf72b1411447b7342963e5aa0382c5
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+Fa una canzona senza note nere
+Se mai bramasti la mia grazia havere
+Falla d'un tuono ch'invita al dormire,
+Dolcemente, dolcemente facendo la finire.
+--bf72b1411447b7342963e5aa0382c5
+Content-Type: application/pgp-keys
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="pEpKey.asc"
+
+LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgp4c0JOQkZWNFBsOEJDQUN1dWtR
+THdzSGZ0SDVqa1ZzU0w3Q09GaGFtTnNFRThsWjhNRzFmMVJ4NXp0UHVaVG5hCllYeVdPRGdwajJC
+eHowVGNQK1ExN0diTEtzZTdUV0QxazlpMVJ6TFd6OFpTQ0xZcTJUdGpMV1BsZVZ1R0dXZXEKWTN0
+VFdIQy9uRmJpdm9sTlBBMG1MMjAzOFRHZEJvbFBhWmlQWjRQOHd1UVZZTmZEcWk0dXRjZXpHRE5T
+OE9IaApFUGhmeUtLb1NNNzlITG9VUGM2eHNmaW14UE1yeWxJL2k4YkZ2ZkRZejV2bXlkZWZ2QXhO
+aHFqTEgzR21oajFwCm5JbnNyYUVpeWg3WTJ6QXhDZnI2aEQ5bmt5N1dpeEJpbktGRmhRcGNVdTFv
+K0llNlVHd0xWYlR5Uk1PY1Jzb2IKeWFocUEvbTJIZkRSajFZK244SEhxc1FrQjJCdG1NWVhsYTNq
+QUJFQkFBSE5RWEJGY0NCVVpYTjBJRUp2WWlBbwpkR1Z6ZENCclpYa3NJR1J2YmlkMElIVnpaU2tn
+UEhCbGNDNTBaWE4wTG1KdllrQndaWEF0Y0hKdmFtVmpkQzV2CmNtYyt3c0NQQkJNQkFnQWlCUUpW
+ZUQ1ZkFoc0RCZ3NKQ0FjREFnWVZDQUlKQ2dzRUZnSURBUUllQVFJWGdBQWgKQ1JCWnYvU0l5Y0x1
+T1JZaEJML050L01CM3U2NytVZnlsbG0vOUlqSnd1NDVwSGtJQUtQY1RyS1EycU1aTGsvTwpDRmg4
+c215anFQM25oRE12QTZqTlBOVC9mOGRZZmlVTGNtWit2U2tZam5VcG5wZDYrdW5jMzFMRkdxdTRr
+SVZHCjNBMTRmZTZNaUFPSDlRY0pRU3cvLzUzdmhJNTZjZ0ZnWlFvVFU0bWFIejh0QjJRMUp6b2sx
+M01tTU5aMHA2SHAKd0F3VzlhTzc4MnEyWCtYUVVheWxCVDEyWUl5M09RcUNiQ2dwbGJucG9SVm5h
+VlBHbzBTalZwRDZVdXMyNTRHcgpUOURtUUJVVE5RYnRSK2JYM0JlTlo2Y1F4NTRTVmZkUUFhNTBz
+bTV5VEh1NFB4Yi9JSENxdEVCdG9KSjVsL3BGClVFdlAzcDZTTmF0Vjh5ZWFPUSs1QTgrM2x5ejN4
+SEZCT25HVHR2ckV0cFpmS2FFRHB4aFQ0VUJiZ09sdU44bU0KeFlnVU53ck93RTBFVlhnK1h3RUlB
+TXBEWkpYcUNOSGszcjNGVjJJSnA1K1BDaHV0ZEhXZUs0RWNFMU5jd25BKwpUYkcvNTd0OWpieEVy
+VUhNNE5nTE1HR21XMjlHZ0p3bUwxTHRHckxQeldkdkdmRC9WTm9xMmZwME1PRms5VWVNCjNlOXF3
+TzU0enJGTVI4U0tFMXpRN0IvakRQMUlHTzZ0NTFSV1IxUEZUc1hGS0JVL1hSMDdHRjIyU05hTVpi
+VU0KWHBhVmdEd0VBZ1IxdW1pRjRrZlBjMFdTRTlEd09YT2pzaWg3YTN1K3RQTzF3RmZYV2paNzRV
+ODZyVkthRVN2dgp6QnRFNERJSlVCY3I3eW9PSGpNT3J5SUF4a3I4cWRtdWJxay9UVDZJRkZ4djRs
+Q0NmY2FmNkZUU1dBVGRnSDJRCkVrdDVab2ZFUTgyZWMwMjliOEV5WG5keTEvd2luNm5Pa0RVcjlM
+YmNwVHNBRVFFQUFjTEFkZ1FZQVFJQUNRVUMKVlhnK1h3SWJEQUFoQ1JCWnYvU0l5Y0x1T1JZaEJM
+L050L01CM3U2NytVZnlsbG0vOUlqSnd1NDVhbThILzNUKwpMRncwWWtlYmxUSWVWb1RwOVV2REp4
+MllTMWdFT255UGZ5c1lJQWo0WUdPc3dJTE16ekxyY3diRUpWZUQra0Y5CjlIZmZTRENhOHhtR01Z
+emUyZW54ZTdyUGJ0ZE4vaGs4eGtCKy8rT3lSdEhrazBtaWtMNmhHamRmdWpQemdXU24KTURWdXNS
+MnZwWVNFdVp5Umxkem5zdjBSVU1MbkFibzBHN2Nvd3pkMmhySWNLczRTVnhRWlJkMGFoY3k4YmdD
+WgpuamxYbldpcjNUNDBZWUJic1laSW5GSVZhZHU2bDBBcVE2WkZKSS9ZVysrY2doT3FRTTZLVHVy
+T3VjaDdKeGNuCm9jSU1qSzM2VXo1VHpQT2dkU3grQ0JNRW1qcXhDVW5SNTV4US9KNTBpSTBjbjYy
+dDNiQ1AwVlRabUYvQkpEQmkKQXM2RWVKVm5HQlVvU1VET2tFST0KPXhyM3kKLS0tLS1FTkQgUEdQ
+IFBVQkxJQyBLRVkgQkxPQ0stLS0tLQo=
+
+--bf72b1411447b7342963e5aa0382c5
+Content-Type: application/pgp-keys
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="sender_key.asc"
+
+LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgp4c0JOQkZWNFBsOEJDQUN1dWtR
+THdzSGZ0SDVqa1ZzU0w3Q09GaGFtTnNFRThsWjhNRzFmMVJ4NXp0UHVaVG5hCllYeVdPRGdwajJC
+eHowVGNQK1ExN0diTEtzZTdUV0QxazlpMVJ6TFd6OFpTQ0xZcTJUdGpMV1BsZVZ1R0dXZXEKWTN0
+VFdIQy9uRmJpdm9sTlBBMG1MMjAzOFRHZEJvbFBhWmlQWjRQOHd1UVZZTmZEcWk0dXRjZXpHRE5T
+OE9IaApFUGhmeUtLb1NNNzlITG9VUGM2eHNmaW14UE1yeWxJL2k4YkZ2ZkRZejV2bXlkZWZ2QXhO
+aHFqTEgzR21oajFwCm5JbnNyYUVpeWg3WTJ6QXhDZnI2aEQ5bmt5N1dpeEJpbktGRmhRcGNVdTFv
+K0llNlVHd0xWYlR5Uk1PY1Jzb2IKeWFocUEvbTJIZkRSajFZK244SEhxc1FrQjJCdG1NWVhsYTNq
+QUJFQkFBSE5RWEJGY0NCVVpYTjBJRUp2WWlBbwpkR1Z6ZENCclpYa3NJR1J2YmlkMElIVnpaU2tn
+UEhCbGNDNTBaWE4wTG1KdllrQndaWEF0Y0hKdmFtVmpkQzV2CmNtYyt3c0NQQkJNQkFnQWlCUUpW
+ZUQ1ZkFoc0RCZ3NKQ0FjREFnWVZDQUlKQ2dzRUZnSURBUUllQVFJWGdBQWgKQ1JCWnYvU0l5Y0x1
+T1JZaEJML050L01CM3U2NytVZnlsbG0vOUlqSnd1NDVwSGtJQUtQY1RyS1EycU1aTGsvTwpDRmg4
+c215anFQM25oRE12QTZqTlBOVC9mOGRZZmlVTGNtWit2U2tZam5VcG5wZDYrdW5jMzFMRkdxdTRr
+SVZHCjNBMTRmZTZNaUFPSDlRY0pRU3cvLzUzdmhJNTZjZ0ZnWlFvVFU0bWFIejh0QjJRMUp6b2sx
+M01tTU5aMHA2SHAKd0F3VzlhTzc4MnEyWCtYUVVheWxCVDEyWUl5M09RcUNiQ2dwbGJucG9SVm5h
+VlBHbzBTalZwRDZVdXMyNTRHcgpUOURtUUJVVE5RYnRSK2JYM0JlTlo2Y1F4NTRTVmZkUUFhNTBz
+bTV5VEh1NFB4Yi9JSENxdEVCdG9KSjVsL3BGClVFdlAzcDZTTmF0Vjh5ZWFPUSs1QTgrM2x5ejN4
+SEZCT25HVHR2ckV0cFpmS2FFRHB4aFQ0VUJiZ09sdU44bU0KeFlnVU53ck93RTBFVlhnK1h3RUlB
+TXBEWkpYcUNOSGszcjNGVjJJSnA1K1BDaHV0ZEhXZUs0RWNFMU5jd25BKwpUYkcvNTd0OWpieEVy
+VUhNNE5nTE1HR21XMjlHZ0p3bUwxTHRHckxQeldkdkdmRC9WTm9xMmZwME1PRms5VWVNCjNlOXF3
+TzU0enJGTVI4U0tFMXpRN0IvakRQMUlHTzZ0NTFSV1IxUEZUc1hGS0JVL1hSMDdHRjIyU05hTVpi
+VU0KWHBhVmdEd0VBZ1IxdW1pRjRrZlBjMFdTRTlEd09YT2pzaWg3YTN1K3RQTzF3RmZYV2paNzRV
+ODZyVkthRVN2dgp6QnRFNERJSlVCY3I3eW9PSGpNT3J5SUF4a3I4cWRtdWJxay9UVDZJRkZ4djRs
+Q0NmY2FmNkZUU1dBVGRnSDJRCkVrdDVab2ZFUTgyZWMwMjliOEV5WG5keTEvd2luNm5Pa0RVcjlM
+YmNwVHNBRVFFQUFjTEFkZ1FZQVFJQUNRVUMKVlhnK1h3SWJEQUFoQ1JCWnYvU0l5Y0x1T1JZaEJM
+L050L01CM3U2NytVZnlsbG0vOUlqSnd1NDVhbThILzNUKwpMRncwWWtlYmxUSWVWb1RwOVV2REp4
+MllTMWdFT255UGZ5c1lJQWo0WUdPc3dJTE16ekxyY3diRUpWZUQra0Y5CjlIZmZTRENhOHhtR01Z
+emUyZW54ZTdyUGJ0ZE4vaGs4eGtCKy8rT3lSdEhrazBtaWtMNmhHamRmdWpQemdXU24KTURWdXNS
+MnZwWVNFdVp5Umxkem5zdjBSVU1MbkFibzBHN2Nvd3pkMmhySWNLczRTVnhRWlJkMGFoY3k4YmdD
+WgpuamxYbldpcjNUNDBZWUJic1laSW5GSVZhZHU2bDBBcVE2WkZKSS9ZVysrY2doT3FRTTZLVHVy
+T3VjaDdKeGNuCm9jSU1qSzM2VXo1VHpQT2dkU3grQ0JNRW1qcXhDVW5SNTV4US9KNTBpSTBjbjYy
+dDNiQ1AwVlRabUYvQkpEQmkKQXM2RWVKVm5HQlVvU1VET2tFST0KPXhyM3kKLS0tLS1FTkQgUEdQ
+IFBVQkxJQyBLRVkgQkxPQ0stLS0tLQo=
+
+--bf72b1411447b7342963e5aa0382c5--

test/test_mails/CanonicalFrom2.2BobToAlice_1_0.eml

@@ -3,106 +3,106 @@ To: Alice Spivak Hyatt <pep.test.alice@pep-project.org>
 Subject: =?utf-8?Q?p=E2=89=A1p?=
 X-pEp-Version: 2.2
 MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="3d9ddd404e334cf876724d5f6ac705d1"; 
+Content-Type: multipart/encrypted; boundary="7fdcc2331befd79f41a7c4c96b68079a"; 
  protocol="application/pgp-encrypted"
 
---3d9ddd404e334cf876724d5f6ac705d1
+--7fdcc2331befd79f41a7c4c96b68079a
 Content-Type: application/pgp-encrypted
 
 Version: 1
---3d9ddd404e334cf876724d5f6ac705d1
+--7fdcc2331befd79f41a7c4c96b68079a
 Content-Type: application/octet-stream
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="msg.asc"
 
 -----BEGIN PGP MESSAGE-----
 
-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
-FGH1ZfcnG+uT+md8VFz/8uApgqWEkieL/vJ3
-=f4v9
+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
+VHSYymD5ACK3DHPWxdkzVjzIt1U2Cw4=
+=jmBT
 -----END PGP MESSAGE-----
 
---3d9ddd404e334cf876724d5f6ac705d1--
+--7fdcc2331befd79f41a7c4c96b68079a--

test/test_mails/CanonicalFrom2.2BobToAlice_1_0_NoKey.eml

@@ -3,48 +3,48 @@ To: Alice Spivak Hyatt <pep.test.alice@pep-project.org>
 Subject: =?utf-8?Q?p=E2=89=A1p?=
 X-pEp-Version: 2.2
 MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="1839724920630d10be0f88ecfd1060"; 
+Content-Type: multipart/encrypted; boundary="32fff902684a481a579478fe749abb43"; 
  protocol="application/pgp-encrypted"
 
---1839724920630d10be0f88ecfd1060
+--32fff902684a481a579478fe749abb43
 Content-Type: application/pgp-encrypted
 
 Version: 1
---1839724920630d10be0f88ecfd1060
+--32fff902684a481a579478fe749abb43
 Content-Type: application/octet-stream
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="msg.asc"
 
 -----BEGIN PGP MESSAGE-----
 
-wcBMA4rbkTfsG51OAQf+L3PYRkqpYnku07eHYme+cfanCKT3veflVxviki6tnqCt
-yVkpt4tcQ0FybrjIkLYHycWfxI4DWdbmx+8X2cjoyRGA8w/6e5eAXNcbMoPt8e6y
-VVwxL1+6Ek9OD217+6ZnmnivZwSmBTDtBhOpiTw51+n6SdZ6PWAvAYhxsAi2rTF9
-+kH9KyLbSsx8rFFgpwZcH8Rn44QXIUpIx5FNBBHGG0sB+uwUYx7ZQ4hILfQPX04C
-MAUppVJvZDq/+IM/E1y5JNl2g8BmsbzMoHQIwc6wL6fpwEYCpJ+qug/e8/n3XPNs
-W3PTBT5l6KOeu/X0mJ7mQWqZOGpmsfGtOoSntk0t+MHATANaAgXZcwg/TQEH/3IG
-H9H6e657IoGxcmDJIohvqRhRE5d3WrW/tBKfEGGxFtm/e1S6gMpPSeZNwjI1GKur
-8L3YI5SYokQZyRk+gZ1CkO54f18D5emm4KUIq/GorOimnC5ij9nZTNThS6G2MMbT
-C3ZYnr1C965qksWShm2fjvzGexDsgrX3xQu9rI2XT2jlda35GZY+hoFcFKRl2Nkz
-BReXaKL5zOu0UHkwlsTuEYXm0ekH8UVQqOcyyedLKq8iqDZ1fYSJ1R8KZJe5Tqyt
-ytjtnxs0ku3gb44V74qX5FzztKk5Rs+HpFAU+acFE6U8PjIcAqFVkr0TM1b1qwy3
-F8XGn63XmjE8RhNOTYPSwiEB6VSIws9DTIlrVxiloaoJLGZzcNlA0ESYCTML/ulx
-DgHs0kllB2VBlds+f8OefsieWRcmaXgELz/f26Wc+iUjpu3HlsxGNGJto4Ytlk8f
-89xlkUBZ3PfTgMkRNvtT2tW5bDUBYfq5sl4LvDY1yFGfVWNm/ELFn+no9uspo4eB
-lQDgN54tyEDeIXfygim9IYn7gQ/RqbU8JKitByyVQnSDM6P6yFpRkWojPAGae3M/
-0C24i5juHYrZxjlgKW6brYDGgZSgRoZt75SNh3daOI1Bkewp+OJxxAdt4S2yVW9h
-/7A2PSfWup/vAZU7rccf6N5SUpiVr44a4ehCb1YGcMvgORk5thdGqxnyrArBrmND
-l4QdIrBbUZbfa52Uwwh/1eNl5GQ3DaeBfcAqr/NHm2fwuLLIE/ne51ZFjMBUkTOr
-WQqObOUZTiVNx04x/l4gEBEFAps8rJz6ogKevc8o0LaGmGQIvTjuYuQDGQE2auiu
-iNYOfRpR0NAsj5VgnfAbiY0ViRB1NK5E88jIeZwD0BVe6k/piqLMUZ4M/njJlhR+
-7KsxmVqBVIvXNmKQiJ7/ZDWMztEKkMHl/M5icjG/TUNZVViVBFOz00/bo+EdJ9Ix
-RgWR+3vHCx2uAgiHIGbAWpnBYLTt7sUyI13PKGSKoRR+vXZMX6UJnE1Iq9xLk7dk
-WWe4TLD1OwhXxIjbpG8nTPaSXwjy5B3JYvQJ5y9i83krRChjg+2uv9PiJ0ltW9Fx
-8yLePdMWN3YQ1C13vWUxgixyHzJomJmAw0K1gAwe+Pq9XFOuEiDaZ5lzIFcPkKa1
-DG/VfnHxeBU3Mq/eXCrOCE8aEJGTBKovKDAyuxcAMwTkwkG/lLeQzYDADD0bgAx7
-cI/vGsCN/E8cIFeTB6FdJRWLviRYTCcmcnALDxZKi5NaRXnMp2wnEFnbnwicooC9
-EI7jqFw0yawnTv8eLSNu7kqqy4Cbp/UJKLnS6epNIBryng==
-=sLPa
+wcBMA4rbkTfsG51OAQf9EI1NVefF1eD2GMmYDl448IuMevBqp+0Z8MFTWoLdH6Zi
+tMJb4WcJpBsUg6pcI/lkrheYT9006OuPYGwA9xSSfc7MGB1MN8M6zaJP2rObxFne
+2X+ShiG/y/yibzMpsOjVg2b+xj1zsszEJ+JMKgcIHays+PXQap1CtX4V/z1L1ZUw
+4Ryfjnhd157M7B5cGmaH0hvrfnoKg/f5rW4rxPNSMMnBWVmTRau0gcDpLeDKLKE7
+GN8ET9CIYThKDGMpzVVQ0PmNj41/IdC6o5QNFYVA4YL0sasujHKS5tdJoV3m8sjO
+dVnYe67hfb0FauZWXLnNquaVGpsRvj8ri8UfYlZkPcHATANaAgXZcwg/TQEIAIzq
+JTN/30ezqTkjtwqxpSprUMTry5o9U5ZllhLJyGCzSrx/Xpa4oa9XrL1t0Oj076Nv
+KPMgZyS8THa6LEQoCYC5PcMCdjrGieLufTZUvcPMLOXV6g6LhwTRgR6AI6IWIpKy
+xrv/5Y2b87foV8GxneJLBc49V/vH1J83QENOfyvJNMLvefOQLZzykZGcRG2otDSm
+PPVIVpwEH9Zm+kfkH/rIvQYGZxuV1nAY6DbrW9aoOV/PeUlR3pWaVSGPM5q5s19h
+cDATSvARtisPffQwFOheJhbO6raiyZLPp/zs3kZeR92LLx78GfPg2glejpYkbJDK
+vYcx9luo3yB4R+8w0PHSwiEBaFc7QD6CUYbIZRTPR4yuHzDTcH/xpLEU/l+J+1nY
+jQnS9TYhFThhSPJDpmzr9dKYZxqwHBFjRAOk7k0ZTP/f6EvjioipK5X/yx8EIb3j
+WaP2oUCW2P/Tvgb9rElrTJ+7xtx0zJ/sSdMonwjLwlcmYlqHRG34F7SLk+5Pnqis
+5ZV9MnxwImAmENGSsBi0kT911nnBNLzfdIsug3OKjfnm/5rdyRxmLrAYcsomdvAe
+y3Pp17prLs+7g4l3QdFllLL/k5PU0ytsKsPEf4M6g5Yu609DGuQru3Y8D87TaoT7
+DxotkhX6rxkUZGzT8wr/96XLbEZx1mdiuoTmRl7npjA2JdgOKeVp6JY7b0dXTD6+
+znHD9sxjsyYJjLW10ogVvybHjEOaswyipKiBhkBNOl7COJv/Dl3U4ZaaloNbAAOS
+E1TjPKjrslyI3Vo+XrqTA25ULogEK1lhVxWKUgIo0j4xcriXQakj4ZkJnEVUVHwn
+vSN39ObZ8ij19x+o3kSjL6ef8DWzJZzLYlMkblB6VIO3/7sxovINdIpdEA8tcZN2
+YngsIAFVPGJyZ2RQ3pG+KHNP5GGC05qDAUc0Yetd9sfyY0lWBKHfdJqKW+jzdm+n
+TIxcPAKdi39uQ9E+c3qwHr4dUJIO5gTSUyt4twF5ZwxV+Db/Gyvvp2Qawf1yDEcf
+Ucg5cESy5aJaZmllHlSzZc0NT4aSZ1nff93DxT6nMc2+VYBBPgVH1YmI8iOXpueZ
+zYEpVAyMywAUGho41k3+s+lvv1j/5R68IvBBvhvqIl6PA7MFlQac4JgoYfsOkcLA
+l3XEjGC4wI4fkMGxQ05oqhknTaQ1JeUmLjveiGIaK9ytbtQF8Nas1c5P7saYR/D6
+3ZgsqWwOMZWoMlH88d+AhhXS4/1RbnOu2jGm2aIitPioTB8Oy3UzlqojfPrlkBNy
+RfEvlOFQo/0Xv1en3EjRDvCINSkYI2yvVehZmSQClbd0Dw==
+=n4ly
 -----END PGP MESSAGE-----
 
---1839724920630d10be0f88ecfd1060--
+--32fff902684a481a579478fe749abb43--

test/test_mails/CanonicalFrom2.2BobToAlice_1_0_TwoKeys.eml

@@ -0,0 +1,163 @@
+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: 2.2
+MIME-Version: 1.0
+Content-Type: multipart/encrypted; boundary="2df6d64846b7d4474a2ac31539ee015c"; 
+ protocol="application/pgp-encrypted"
+
+--2df6d64846b7d4474a2ac31539ee015c
+Content-Type: application/pgp-encrypted
+
+Version: 1
+--2df6d64846b7d4474a2ac31539ee015c
+Content-Type: application/octet-stream
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline; filename="msg.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+Y3cEY9nL
+=ohaI
+-----END PGP MESSAGE-----
+
+--2df6d64846b7d4474a2ac31539ee015c--

test/test_mails/CanonicalFrom2.2BobToAlice_2_0.eml

@@ -1,121 +1,121 @@
-Message-ID: <pEp.QUBOZX.0YKBGCFAUUI7K.86CAE8B3-9932-415E-A5E9-21E825429CFD@pep-project.org>
+Message-ID: <pEp.QUC3E0.11ZZSAEIL0OKO.6A981EE7-4CF7-44B9-9C73-BB97D9488053@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: 2.2
 MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="2456ef2f3d820ead42915010d36b904"; 
+Content-Type: multipart/encrypted; boundary="2443a8582d1d5ae96763845e75a2a8d4"; 
  protocol="application/pgp-encrypted"
 
---2456ef2f3d820ead42915010d36b904
+--2443a8582d1d5ae96763845e75a2a8d4
 Content-Type: application/pgp-encrypted
 
 Version: 1
---2456ef2f3d820ead42915010d36b904
+--2443a8582d1d5ae96763845e75a2a8d4
 Content-Type: application/octet-stream
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="msg.asc"
 
 -----BEGIN PGP MESSAGE-----
 
-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
-dgRy5KOJ70Bvk2pxEU7NTBe2AQ==
-=XABg
+wcBMA4rbkTfsG51OAQgAoo4vdGfRSycRVr0uopGnx42wFGeEVFDS73PUpbh/xL9O
+S9AIha/fsk3tYWp9zDvVk6Ojqd6ddNVNntVAVLgdoY5CvrWmEoTtQx1ys7LSuq3W
+iGeDhJ8fAmaKXGFbhqR6Fod2At/LPxmiMyqfl7/JBX/X7QSqcilgzZHT8Abu7wOR
+zvqIZYm3tSyAVn+r0w1jCXHbFJ0dsjyR/Z53Ixos9zpdOQ/5QTHysBqVvmx74eaD
+DMa/G0CHr8dzCSrB8EH7ay9fnrA/2tA6KTtizQ08eGGPNPesDHMxi+6tigdKOqPu
+jma8Lv2+sl5qKpzg/+eBVfRmEz3N8g5rog4vww8Q0sHATANaAgXZcwg/TQEH/1tD
+MjZb3DoH8Aq6AyYZgaqO3amPos0P7e9qe/eoHvkdTb6qYV7gAtG02xSoFk9r8clX
+KTIG8UTvptF27abVWTmAcdzAjh6LKIQgcDKy3UO0TIdw+SsMzzm3prlmqAlXlzlG
+2RX4xWc0PtrqS8m2ksRwcYZT0QFRmJI97GZKu4b2vnYDdiZKi29Xp+T4Lh8RIqKP
+pcbZO9GbrQc+bs7btrQGiwuv6ZrTdCFG427iLvTsMYoSx5C3FQPT5OaXqnvCi+Hb
+KsfCJcmz1ZTY5dJOSFHT51w1HmsIDa0CDovOh6HLlrgdYDK8ZdiQAuyox7o8itjU
+jyX7f29MnjMoTEBM+GLSzzcBWGw6cs3j+pwsk92ctxVh+A2wBNXkzyjGlA02jfSL
+4y5GuQFgWzhMqlJybhE2jDP85kU82Bb8hyIwpQk8dcTMaxJcxDS/JMgTeGtQ6xof
+0hNAsggZluKTWO+tE+OlzO/lbXFXm8ZYEaqVAqCLOLngD3wFugnsHzXo9bNry0hK
+I0py4eJXOBdR8rRkzF4BUC3JnqRP5I8pT5ACCWpRY0UgCsu2Brf8dqoka7SExsCD
+vFMD8CeHGRu6xGnqyNLaxaOZsGXY19+iA7ObBKReGL9oUzOh+Glnt2VjETZGsE9W
+4puCyoqQEMdhw5ZIjExlfhGsQcTveMFmg3Pc+wIPclYuypSjbTrwDVvazItsf7IK
+qHKG/fay/QrB97wCUzhz7huMOfKZzQv92lqXF5ZTzuDbBn2GkOxvo3j1EYCJAE0S
+ezrPQtE1q3A705d63obLhWPCbyU4gXN7ax9dI8RfgwRtZgO7cuHPyanqF7ckP0Ti
+DGj4Hw8N2Vn5Rk89IeAVHeJyvHFqB+tPnsC4tVHlfj14e5eAHwroT66gRP+Yx1t1
+jOW95+cYMuaDkTVXvz1RjOlLsNZlNj1B1Gp47IG3ctV3zMiL23mZEu4YvbKUWFwO
+CGnU5YxVMmqyOT935RBalsxbZaEht+B/hyJzXo6N0H5D90pOWMKKFWWyq/cBOMUM
+y84oVAvzLTDKJea6GJVDICqMAFKYhxtBQQLztO38xJXf+lJOWm9UjrwVp8V1TjE/
+ioQVOObrYdkTjrBiJcHBuR3hNVlt6sHB9hutLMKtZwWUTpxniySrYnWZvhnWeg8Y
+mI7so12/AuicnWqiaQde2nNf4rpi4tNBx9+ArrS46UArrKZWADdAMulSGtm3C7rb
+R/VaYpD/tCQ7QLvMv0rOMfwk+rX7z0poyy0janlaeSemKYMmMiaEbPqUvXmxq1ZU
+Ed07+3q/3g2Jntbl1fL3lEPdMvxC50GFL8Hj2VtMah/YdcPV8sSMa1HlEVgV4ITX
+mUlmRjDiEDP3fH0HPtwvy41B2uAr952XOTc2MUviBL1e0WRmGnVHmhxKc3sYazRz
+gM/cYe4AsRv5KXm0rmlpxaord461EbZ92d/KFk+em72O0P7D8Qguk4ql4LnxniSQ
+5hUpXznDBI4Bbwhw94D7TZEiALYCdJsOfiMUrp48FNGpdo4v8qLSYfOTgfvoRzbQ
+TyDyPOTeCHe8iaI4QrkpSFyBAXlvfB7UYm/dqpcxQBhKfdt/KWYzqfZqThdv94HW
+oqgHRrVl0FN52/PR0bUGWarTeqlVP6qCPjNygDnkyWh38fhH0lIcEg3HY4dzgFjo
+QJZ803WiT4zs7aNJUO22pMHjvW4nl/SzPPTV0V9W1cRZ98Bnp2kj3SwBMumD57wT
+dUj0wzbzf8aQ5x/Ab5snEmgknhJw270G7VRwczArDKcONIOgQ0RjtgXdDEwE0oqY
+rNVv72tdeUN7ABACd4iErEachqZ5p2FGaDCSSqV/KW6R7sQlIyi0Cb85zWdcvfVg
+cFyzWyTIbZO4yKOqWOb1LBoBGzyF7MS41Rgn5u9a1CMgysDp83jt0YIbTKmbim/c
+z150oDta/ic0jtSdvwo2ujU+/hpvkCyMsQKJcQqKFF806NynBId7tGX41n4Q95Yz
+05v5YHa9HqimZ8inLNxrKaRX82g8KMbqNKtAsCdwI5CfSOb3xoSQvczuglS72bPu
+fPaz0D5FDjLlOeHPPd/CxzyT2dIbvQR68tjkAipa1Ufj25y/X/a0cfprw708IEEV
+7G9d1tovSYaG0my+XqDJjJuETMHSD83hPrVoymtuU1rQF577Zra1uTasPE2I9fcY
+e27qKlHPSGtLPPAWmou4VOXGojbmUNTv5aH3BViTzzBxophcW5nWjQJj56c0NPFE
+jksFFeVoSSSA5+BnZzWLxEZBULh8XSBX0Nq/NxwA1iHJHGGvM7Rf0CSyWNhaOQ20
+C9soDJo/UQy/hbGrhkxWK1+W3eN9HsUITidDn/IvG+KLoGJhY62wYLWDR/S5ge+L
+lGb3FMICAV3AlXFxtMmtt4uoC7RCShvqRTrb78M6Pz1WITHsmMIUjx3r/wY1GtBt
+cq3hNg35utVUH/X10I7JjIpV/aI1JCGAv+tPmOzAWHGuM0N0WKYHw85mEGNigVCi
+MPHNagO3bb3C9UjIU5btrEf26R7Ft4g4O1nka0MIdw+IkxDBPZtkkQ3c0j5NGrga
+Ji65bhNvaQjZ6quDI76zAvG3XcdodTf6wpzzC+7rp3zV6hOove3srIl/AYGJC06d
+aAz/8iOCC25kS73vJFr6JcqFkytpLHvDL0Vdn9OAOJtKk2GtPfhNJSX6V0dsiTu2
+UZDpC9pttZOslLwNt8b89u6iFGwlMwJOGoeAEuXOvgaWKNIZg0fQdMwg6GQqGTBF
+9sX0KQSQ7ikOKwGp/Mim4Y59y33bsBbfekhH7w9o+flASA3fnZJ4WHOgSJS7kqKq
+oROjnTZr9vyNlg6L0vSsj0aTtactVP5FiCFa4nkxf8eAwTj1LWIuWsi2gIhMaPWO
+k4g9oJdSjLj+ck9tldiJmEsx8+9zLSSUoaqNjl6pRIrOYJ4SMw1H8Q9U/n3wcjJG
+0UH7q0jCcmrJ+GpGGKCNsGZ5odHaynETr8TvqnCixWTTUnU6aLV3h7GKzY9Jmwe6
+YtvL4YvgQkJ5cUbpk9QEf3uvj2JWPzMTP8yp39Z8M4g28/1szvJAYjscGKdIQwPG
+RDReD/21CUxN+9G0K4d7nB2nA0mVVVKYza1/z1WhpsgjAuaIxJD2JxgkeMGblQCb
+DONFHbZtMq4HXeY/rFsOyEo8lIzwrVP12Kh2HirL7gts2ywwGQUQFc3gX4KoGK0P
+CASBz1rO5XJB/Ac4uxpROXfDT67QIIoRdyJvUaFrsTfCudKVWFZUjKJQAuk1gdma
+x5CCK7kASUa3Ust//ejZJEPMrZ+4WLoG36qW9I2vLZO2Jr2g2AIjZMpf3ah+xWZJ
+Tw/aH+Arhn7APoj9KVo0inaFksaugpDRGHw0r5mFtPEZmr0MoRX4ma4kaYnJgC+H
+YgsAouISbh3mj6/QT6IMI6Mca70DMcw3bIc5nCYa1Yw1D1GKr5K8LavQOQGJeum1
+7RlIzBcbUigSb7B+ldq195ztu7HofsdZ/lsFonOPuuSu/x/pYsXbsA82a88Q4iU9
+nYJC7ub/kmAnvl9jmM1Ys6fi1fnwPY/10MgMrafWZAUC4ErzJkmvmqQL9vd2hd97
+Ru/EhV7VHyGrDrlwDr9GSGe2ulTeEeTYdteSMqCQCEz3TSLikscR93jW1yd/Ukkq
+aqYApHj5Y8N/IhILnd5t/sipQ0rAKH2ODwBeemzbcXIvrye5NrxXM/6u5Ddrj8Kt
+rUGkkd6ch4sgh+QpBahh2hiDOSni91eVGv/hVL8CAkx47YZ07Q+mEaHbgapxJ0tk
+2m92S5n9tr3ikmH/VXDm5t/tR5FdtOYPIxIcR5nAXWGw+A3h/tsdJHWi7fDRnpCX
+Jj5MLlzhuv/HNORHjcOtiNbGmwJoAVJ5rbyzXgBkfhHkac733Kwuw7BXCHjeTk6T
+fCBB+ucub3t1ARx8caQZ8c8MNjfHTAKqt8LPtxg1wdmvRWslvUs5+vbO5IP2pI2Y
+HWnQs8MMNyPJLUXIYZzj3+JWZi1FOHbtufXrOwtqHFtWtAkeJBF7jN/7/j3zUFaH
+ivVaAR/+/aaVjqNMvYv9BJzf5G2y3nlQGf+z3ZXDse1St0+XI/mQ2zp9wugWMat1
+Oj8mZ6VuHhl+mZ4CRizHkFdQPDMJP3x6lfXRpMDtZKdNDbVPfibZZmmHJ+SwX2cS
+iSSn1DjBMqiTWpXdLTaIlhiHmOUhzWAQzmwqOpzhNEOXiDiQRAGVd7DvczgTk4sL
+nU5DPSn1iN5iICo6p/O5jZfehHVPegOmGSyenkxj60DyPdljWb1iH+/a1ZYMJiof
+eD9TUqpP5M+rij6kF0x4mJyeSkK2SW7VlFLxf4fzfV+DhJMiz8taWsAG8nyiYRgn
+E//K/2MriJpv+lKZX4BLLJl5Uu8xCfjLjqVMombavd+X2Mx+c0G1HiDXKN6gXD/c
+dUx3uyq8UyhJ7r98b74B5svjGaKX8+pMlHuof0m2/YHFl/M6p5B5zr3AsLWB+LXF
+KzH8M2MbuLvtqrCoZorNQ5CBJ5VsZutAPr7NQke1Gy8ITE8494qzI+KdSu/JQghQ
+KvQN0tIX3IujZ4RzACQIEmE35loWo1V9j7soN6Twih1OUnbWWytpT+BDDa/ki/cN
+JuOgu43uiQGGqmRIAyVXiCrIQKlVwj8OultJ+AmMROhGy5CTYAg7mDBSRXx1iQ3b
+Ns2QZkkt9kC+4fMMkHGDu2rnVEYS0O3RafWbGkw5lIjHcSzF1wmPPA6dcFx1ou5h
+CJawLXi9XLZV5xAQCEcDHwUJD8zvMq2GTrdeZE+EXWtSVqTjjI98oNIUCsLF26d8
+y0VBALxptwgEHBkmMw8LLANpz5Eh56kRKXc2yoA3+ryRoOuwWiXygXaQ5ar3e9I/
+2V3dVN7iCvf0bXyfudgeCJw4gMXPeh7Vg/jyzgR2pSX6b5HlB42T5K7ibo0+lplm
+ZFTlxpIT+kRGydCNO3KVhN2z7oXkDi0DufcY5xgOaJFtVojibojuuemzTQCSHpoA
++8Z3x8xY5WsvjZOrx22a3jd21qLG8MSXsmyLJ8rHtj3z98W2LpN6X1gQyH+ogE/S
+n8R2I6r52NHB7q6ZpGI4DA4/QO5XCho0IBcujR6wCUacY0OHuZg4/3CWG49SRyzN
+CCj2xzzwhRivabYiIJW4KFyle9eEREuDTRb71mDT7zASk0BH4Hk7ZRK66Edoy1G/
+wyUxX9Ni0GM0lG4GY80961848jM9sVVJWPF3SO7zjJs13yfEt0AbpBJzTPCuHGPw
+q/HntTxpDmfz5l6pEDYQCpznJsIakUkY4+5iNwogrndATYbBKq0UbXZZnKw+zFdX
+CY3rzfaf0tQxlhpdL0TOutXK7WV0Sjtx0NPAWaEQZ60FVVro+ZAh6/1U+bDBTeu2
+U/kn8EjtOsws2+gLInD1UHAiKeDSCsavzbCzXHMjSK9fLPwDVBSUCVrSo4DihmNR
+cHxwffQTRRc+CKSdynE0jX3E1nA6+gJB42iRkcnvzP8pnIq5MI0j6LDHl1XnPFb6
+UeVS+NqD0d0a21P9GJARUytk2/vZVV/Mo5HNY8lLt8qs1SKRcZ3Wha9JXV2r4wWc
+Qkp5N3uFsw4c0D4w0nBA8It54MqEvgRa/c3Tav4UzyFQq/YKnFIFNqKHnK1NR7cH
+VWiHm3Dysoyz1Ox7H1uAjXVPUIKfMdq8QXF4PYAhxTYh+1I7Us5V+qtRVwP5UtqZ
+o7uV7zrDZVYuFzABCTOmajEwI+/zsB3V9j/qIpl3rtMOQLTt43Cdq5wpXODsJa0X
+3XUuwZDkxyKQVVJqi/w7OtP+6sxz2j5A
+=Vxos
 -----END PGP MESSAGE-----
 
---2456ef2f3d820ead42915010d36b904--
+--2443a8582d1d5ae96763845e75a2a8d4--

test/test_mails/CanonicalFrom2.2BobToAlice_2_0_NoKey.eml

@@ -1,66 +1,66 @@
-Message-ID: <pEp.QUBP09.1LEKG3DX96NE0.11CE1791-0C75-4F34-B857-FCCE8932C8AB@pep-project.org>
+Message-ID: <pEp.QUC3E1.12017GQ65URSC.7C4E218C-8501-4280-A97C-ADDE21F0DC10@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: 2.2
 MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="7df9b6ad8c1667a508cf39d3d7381fa"; 
+Content-Type: multipart/encrypted; boundary="4f4ef00523f9c13c649bb77c275ac794"; 
  protocol="application/pgp-encrypted"
 
---7df9b6ad8c1667a508cf39d3d7381fa
+--4f4ef00523f9c13c649bb77c275ac794
 Content-Type: application/pgp-encrypted
 
 Version: 1
---7df9b6ad8c1667a508cf39d3d7381fa
+--4f4ef00523f9c13c649bb77c275ac794
 Content-Type: application/octet-stream
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="msg.asc"
 
 -----BEGIN PGP MESSAGE-----
 
-wcBMA4rbkTfsG51OAQgAiqMerHzDRwJntFTQrGYBdMz5AZqDlxc1oob2EhrdNM6j
-LJZlzoIfYkj0QZko/o10fvpLSbtJTmoKr403Qkt7VWCIBqnkXCdBrRsWWtgy2tIs
-2zUk0V1VyjFXCCfuVpqwyJdLANZelcMgX2YqyK6CFypVwQ1gcfKO6Qi58d8+0NDU
-iJm/SjlIqOAYLJiVNhmiOtWZkHCPhUDTWb3wJmoeKHaR54mKWejWCcl+ovbHPkhK
-/XU1BGyVSL5p8PzkCRMINXWtsGfb+j0ZXu1w0ICPNqSdDUwi1xgEgMzOsdgwZDkB
-Cc30ZFF7yEEFj8CG48pdu4ipKZfQCLScEEQtgi00GsHATANaAgXZcwg/TQEH/1MD
-8x6nfrGIXFwsk0UHlCgT3+pRQb71S0PnaXfXWnwmXG+N7cAJZu6LI/7B5XPohBrg
-AGt04k/f6k4E3ikq1cjsbF7Bi4H1CGOUgFZU//dvBrXsJPlMuSKub49x5z6jw00z
-NTHeYzyYTYP290GjPo1XKqJOdF4aKVb5jH5Crj8Wt7G/swlaqhN8Oguf1rFy0s9b
-YZwwU2Jyinp54aAInAaSPChWKt6gNrq+IxNsK8UiQQAKbbxbog/ly3YW2WVKW0qV
-Y6Q/9Xz2tXCSl5q3g6ND6rOZLdbPSefdZvqnpgIK56iTZctp+HYHUSA9Vqu7FQHy
-FaMtrBkES4wQSBMpil3SxPgBoztt/bZuCWbXXTd6b62vL+yhJ6umRzF7ZqoqrVFS
-26Yj1oChOwxP3jUoTPYZvVcpeFIlU647tQOzibNop5P93vl5ylLo6mQnCw1wtL8o
-RfT/wk3Tm8b7baUBLxjim+YPqrE/mXMKCIG1QacPVSW+asA2kmO/nCYgipLbFaUO
-scv8NXmd2A3DHfy3W71idGBox0Y2Lz9i854YTBPtwL9CeIPOJDOUUGQacUnoA7DB