security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* packet.h, getkey.c (merge_selfsigs, merge_selfsigs_main), pkclist.c

Browse source 
(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:
David Shaw 2004-01-22 01:08:58 +00:00
parent 01d0c54f05
commit cceda5c9d2
4 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
g10/getkey.c
View file

@ -1,6 +1,6 @@
/* getkey.c - Get a key from the database
* Copyright (C) 1998, 1999, 2000, 2001, 2002,
* 2003 Free Software Foundation, Inc.
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
* 2004 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -1532,7 +1532,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;
@ -1976,8 +1976,8 @@ merge_selfsigs( KBNODE keyblock )
PKT_public_key *pk = k->pkt->pkt.public_key;
if(!main_pk->is_valid)
pk->is_valid = 0;
if(revoked)
pk->is_revoked = 1;
if(revoked && !pk->is_revoked)
pk->is_revoked = revoked;
if(main_pk->has_expired)
pk->has_expired = main_pk->has_expired;
}