1.1 --- a/src/pEpEngine.c Sun Feb 02 15:13:56 2020 +0100
1.2 +++ b/src/pEpEngine.c Mon Feb 03 11:06:48 2020 +0100
1.3 @@ -216,7 +216,7 @@
1.4 " (select identity.main_key_id from identity "
1.5 " join trust on trust.user_id = identity.user_id "
1.6 " and trust.pgp_keypair_fpr = identity.main_key_id "
1.7 - " join person on identity.user_id = identity.user_id "
1.8 + " join person on person.id = identity.user_id "
1.9 " where identity.user_id = ?1 "
1.10 " order by trust.comm_type desc "
1.11 " limit 1) "
2.1 --- a/src/pgp_sequoia.c Sun Feb 02 15:13:56 2020 +0100
2.2 +++ b/src/pgp_sequoia.c Mon Feb 03 11:06:48 2020 +0100
2.3 @@ -2729,6 +2729,10 @@
2.4 if (*expired)
2.5 goto out;
2.6
2.7 + // Why is this an indicator of just an expired key and not a broken one?
2.8 + // This will also reject keys that are not expired, but rather missing
2.9 + // subkeys.
2.10 + //
2.11 // Are there at least one certification subkey, one signing subkey
2.12 // and one encryption subkey that are live?
2.13 // int can_certify = 0, can_encrypt = 0, can_sign = 0;
2.14 @@ -2850,6 +2854,9 @@
2.15 goto out;
2.16 }
2.17
2.18 + // Why was this in "expired"???
2.19 +
2.20 +
2.21 bool expired = false;
2.22
2.23 // MUST guarantee the same behaviour.
3.1 --- a/test/src/Message2_1Test.cc Sun Feb 02 15:13:56 2020 +0100
3.2 +++ b/test/src/Message2_1Test.cc Mon Feb 03 11:06:48 2020 +0100
3.3 @@ -403,6 +403,11 @@
3.4 ASSERT_EQ(status , PEP_STATUS_OK);
3.5 // generate message
3.6
3.7 + pEp_identity* alice = new_identity("pep.test.alice@pep-project.org", NULL, NULL, NULL);
3.8 + status = update_identity(session, alice);
3.9 + ASSERT_EQ(status , PEP_STATUS_OK);
3.10 + ASSERT_EQ(alice->comm_type, PEP_ct_pEp_unconfirmed);
3.11 +
3.12 message* msg = new_message(PEP_dir_outgoing);
3.13
3.14 msg->from = carol;