ENGINE-27: #comment Since update_identity should now never return any blacklisted key (set_identity should not try to set one - we ignore the key in src->from in _update_identity_for_incominh_messages coming into update_identity), removing explicit PEP_KEY_BLACKLISTED check here because it's just code pollution, and would mask a now hopefully impossible error ENGINE-27
authorKrista Grothoff <krista@pep-project.org>
Mon, 26 Sep 2016 08:18:36 +0200
branchENGINE-27
changeset 11924fcbac2192c8
parent 1189 191016bbca66
child 1193 01d0a3e883cc
ENGINE-27: #comment Since update_identity should now never return any blacklisted key (set_identity should not try to set one - we ignore the key in src->from in _update_identity_for_incominh_messages coming into update_identity), removing explicit PEP_KEY_BLACKLISTED check here because it's just code pollution, and would mask a now hopefully impossible error
src/message_api.c
     1.1 --- a/src/message_api.c	Sun Sep 25 17:48:43 2016 +0200
     1.2 +++ b/src/message_api.c	Mon Sep 26 08:18:36 2016 +0200
     1.3 @@ -1326,7 +1326,7 @@
     1.4      PEP_STATUS status;
     1.5      if (src->from && src->from->address) {
     1.6          status = update_identity(session, src->from);
     1.7 -        if ((status == PEP_STATUS_OK || status == PEP_KEY_BLACKLISTED)
     1.8 +        if (status == PEP_STATUS_OK
     1.9                  && is_a_pEpmessage(src)
    1.10                  && src->from->comm_type >= PEP_ct_OpenPGP_unconfirmed
    1.11                  && src->from->comm_type != PEP_ct_pEp_unconfirmed
    1.12 @@ -1335,8 +1335,6 @@
    1.13              src->from->comm_type |= PEP_ct_pEp_unconfirmed;
    1.14              status = update_identity(session, src->from);
    1.15          }
    1.16 -        if (status == PEP_KEY_BLACKLISTED)
    1.17 -            status = PEP_STATUS_OK;
    1.18          return status;
    1.19      }
    1.20      return PEP_ILLEGAL_VALUE;