mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* packet.h, getkey.c (merge_selfsigs, merge_selfsigs_main), pkclist.c
(check_signatures_trust): Indicate who has revoked a key (the owner or a designated revoker). If a key was revoked by both, prefer the owner.
This commit is contained in:
parent
006372cf77
commit
aeb16fcca1
4 changed files with 16 additions and 4 deletions
|
@ -1521,7 +1521,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
|
|||
int rc=check_revocation_keys(pk,sig);
|
||||
if(rc==0)
|
||||
{
|
||||
*r_revoked=1;
|
||||
*r_revoked=2;
|
||||
/* don't continue checking since we can't be any
|
||||
more revoked than this */
|
||||
break;
|
||||
|
@ -1973,7 +1973,7 @@ merge_selfsigs( KBNODE keyblock )
|
|||
if(!main_pk->is_valid)
|
||||
pk->is_valid = 0;
|
||||
if(revoked)
|
||||
pk->is_revoked = 1;
|
||||
pk->is_revoked = revoked;
|
||||
if(main_pk->has_expired)
|
||||
pk->has_expired = main_pk->has_expired;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue