diff options
| author | David Shaw <[email protected]> | 2004-01-22 01:08:58 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-01-22 01:08:58 +0000 |
| commit | cceda5c9d22591162c7ebacf3685f6829b0bebf5 (patch) | |
| tree | 8da355053d992958f29d1e9ea3a188a167d7b5a2 /g10/getkey.c | |
| parent | * keyedit.c (print_and_check_one_sig, keyedit_menu): Use the COLUMNS (diff) | |
| download | gnupg-cceda5c9d22591162c7ebacf3685f6829b0bebf5.tar.gz gnupg-cceda5c9d22591162c7ebacf3685f6829b0bebf5.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/getkey.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 4aba21eae..e5c311832 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -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; } |