ENGINE-716: moved fix into pgp_sequoia.c, now check for address==username

src/keymanagement.c

@@ -1074,8 +1074,6 @@ PEP_STATUS _myself(PEP_SESSION session,
     char* default_own_id = NULL;
     status = get_default_own_userid(session, &default_own_id);
     
-    bool no_uname_on_entry = EMPTYSTR(identity->username);
-
     // Deal with non-default user_ids.
     // FIXME: if non-default and read-only, reject totally?
     if (default_own_id && strcmp(default_own_id, identity->user_id) != 0) {
@@ -1199,15 +1197,7 @@ PEP_STATUS _myself(PEP_SESSION session,
 
             free(identity->fpr);
             identity->fpr = NULL;
-            char* namecache = NULL;
-            if (no_uname_on_entry) {
-                namecache = identity->username;
-                identity->username = NULL;
-            }
             status = generate_keypair(session, identity);
-            if (namecache) {
-                identity->username = namecache;
-            }
             assert(status != PEP_OUT_OF_MEMORY);
 
             if (status != PEP_STATUS_OK) {

src/pgp_sequoia.c

@@ -2023,9 +2023,18 @@ PEP_STATUS pgp_generate_keypair(PEP_SESSION session, pEp_identity *identity)
     assert(identity->fpr == NULL || identity->fpr[0] == 0);
 //    assert(identity->username);
 
+    char* cached_username = identity->username;
+    
+    if (identity->username && strcmp(identity->address, identity->username) == 0) {
+        cached_username = identity->username;
+        identity->username = NULL;
+    }
+    
     userid_packet = pgp_user_id_from_unchecked_address(&err,
                                                        identity->username, NULL,
-                                                       identity->address);
+                                                       identity->address);           
+    identity->username = cached_username;                                                   
+
     if (!userid_packet)
         ERROR_OUT(err, PEP_UNKNOWN_ERROR, "pgp_user_id_from_other_address");
 

test/src/KeyResetMessageTest.cc

@@ -2410,6 +2410,29 @@ TEST_F(KeyResetMessageTest, check_reset_mistrust_next_msg_have_not_mailed) {
     ASSERT_EQ(rating, PEP_rating_reliable);
 
 }
+
+// ENGINE-716
+TEST_F(KeyResetMessageTest, check_reset_all_own_keys_one_URI_partner) {
+    // me
+    pEp_identity* me = new_identity("payto://BIC/SYSTEMA", NULL, "SystemA", NULL);
+    PEP_STATUS status = myself(session, me);
+    ASSERT_EQ(status, PEP_STATUS_OK);
+    ASSERT_NE(me->fpr, nullptr);  
+    char* copy_fpr = strdup(me->fpr);
+    
+    // I don't think this is relevant.
+    pEp_identity* you = new_identity("payto://BIC/SYSTEMB", NULL, "SystemB", NULL); 
+    ASSERT_TRUE(slurp_and_import_key(session, "test_keys/pub/SYSTEMB-0xD47A817B3_pub.asc"));
+    status = update_identity(session, you);
+    ASSERT_EQ(status, PEP_STATUS_OK);
+    ASSERT_NE(you->fpr, nullptr);  
+    
+    status = key_reset_all_own_keys(session);    
+    ASSERT_EQ(status, PEP_STATUS_OK);
+    status = myself(session, me);
+    ASSERT_STRNE(me->fpr, copy_fpr);
+}
+
 /*
 TEST_F(KeyResetMessageTest, check_reset_own_with_revocations) {
     pEp_identity* id1 = new_identity("krista-not-real@darthmama.org", NULL, PEP_OWN_USERID, "Krista at Home");

test/test_keys/priv/SYSTEMB-0xD47A817B3_priv.asc

@@ -0,0 +1,58 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+nX8IbKh1VA==
+=x6HV
+-----END PGP PRIVATE KEY BLOCK-----

test/test_keys/pub/SYSTEMB-0xD47A817B3_pub.asc

@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBF5xGNABCACsyQrsxfLL9/5b4Gm8A1jqkRh80j8keizf2iOJ4rp4SWEE6o62
+bR69OS/UM7NN5tTaYBYACXWd2lr8Gi+IypkWe9xyfrq26nJVtLRj6hV3+IIrpzg9
+G7o1nKGAv4qMqWDhrFNM0veiHf680rWSkk/8HkWQMZHXxPQCgMt4sSRbvkepgn4C
+6rn7YkC5yyvlcfn252AEkGwa+5q+incXkAoxx8viph6sInr1w8cCR3iBS3+2/zXy
+tQ+q4IhFHYAesu4IxA+/XN+nyKIrWAQnFZEygq4/icgPsjc6rSJXlaefLYgEHG3k
+qjqdwxjvzew9B+VzpUyEwZ8aMy0W6/6IyCsTABEBAAG0KXBheXRvOi8vQklDL1NZ
+U1RFTUIgPHBheXRvOi8vQklDL1NZU1RFTUI+iQFUBBMBCAA+FiEE5TF1CQ0sUg31
+HkxzJYrMTUeoF7MFAl5xGNACGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgEC
+F4AACgkQJYrMTUeoF7OKbwf/QDmLHPbo6xHE7rPythCPZBVToSJlEhcotJu1p9yM
+sqn52LR47X8K+eaJ8M0LTOTXhu+jV0q9YOP0rUOJfuBU81DmWe2/cnsoAdP8jgCc
+8bO4S4MXZOe7//FY6uEpfhqfPtSsiIsCPWjqmSAGFmBSxUHP0MiJob6giV6o6DS1
+aynOtq/3xOT6hDW4+PBfqT/i4W5OZEjX/v6DaaMefTIjxP2ZHe+4qlG6daUlIP0w
+LGKIu7/XcMBPwLLKnzgK4j48klu68zhSJTKlDWI183uIvVxsfWnG4nnbCJX9PnUa
+fqW+OdB04rdVsqKFb5X/pZmmEDfQKE5AchQawv7woiycULkBDQRecRjQAQgA+Uvr
+x+X1SzH8iTKsaDq68tucEhEq+TPIGsKUtIUI9tzIlPNsLS8Wrr9yVO1lq45rdvGb
+Et0/trjxWfGPQPCGupI8Stl6c6I6lHjnNtsDB/MULFJz6IBdYT7WGz8+iGAVx0KI
+HAdRfOK+iGFSn4oSnBlbk1zo7mX5Eu7gIwyVgM0e3X9LxsVKYvvQZZkwUY46mxJ1
+IEHNBIzaEh8ds+gpWWLUmJHPdB/cFbNh/fcM5xhamBdvcVa9t3UsVpjQNzSkY+TR
+fQnT8DshKJZ7+O3iUfZkqOFAUBFvJFXDjanBbrYePGwH6NrDXTn/WfzAmvf6NhuH
+e1mnaIpVkjJH8V9QJwARAQABiQE8BBgBCAAmFiEE5TF1CQ0sUg31HkxzJYrMTUeo
+F7MFAl5xGNACGwwFCQPCZwAACgkQJYrMTUeoF7NsHAf/fQkzW40U8J7gOy9yX6As
+1KjsrydcNaJN8y5IOa0216vQLJZEHbb1a/8YW77CeBpL2sPu/LCiwl8Mks/iMAA+
+U2ehXiKbDlAVQZQpDqbgNurQDyUPMRReXopj9IaccYlZ+QrV5WE278wf9y6D5p9X
+HDDgD884Sd9bC2n3YvjOcUJovXS8lp9jo3ENGY/28N7oqcX5C2HHRZB1oswWUr3v
+ih+IiIe8J9Q1pim1Qki6Iye6Lj9AyOzVO2nEvcWys0GO8vtUpl5pyy+fWoegycAW
+DKKdn1VY8oAyOmhxiZWXGaFFDgx36jamSj+XhPfQU/xwTndcXMjEGThinX8IbKh1
+VA==
+=rqmY
+-----END PGP PUBLIC KEY BLOCK-----