security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-22 14:57:02 +01:00
Code Activity

* trustdb.c (clean_sigs_from_uid): Include sigs from unavailable keys in

Browse Source 
the sigs that are cleaned.  Suggested by Dirk Traulsen and many others.
This commit is contained in:
David Shaw 2005-11-02 16:47:02 +00:00
parent 19de04694e
commit 4e27a9f5da
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2005-11-02 David Shaw <dshaw@jabberwocky.com>
* trustdb.c (clean_sigs_from_uid): Include sigs from unavailable
keys in the sigs that are cleaned. Suggested by Dirk Traulsen and
many others.
2005-11-01 David Shaw <dshaw@jabberwocky.com> 2005-11-01 David Shaw <dshaw@jabberwocky.com>
* import.c (import_one): Do collapse_uids() before we do any * import.c (import_one): Do collapse_uids() before we do any

16
g10/trustdb.c
View File

@ -1616,19 +1616,25 @@ clean_sigs_from_uid(KBNODE keyblock,KBNODE uidnode,int noisy)
continue; continue;
/* ... and sigs from unavailable keys. */ /* ... and sigs from unavailable keys. */
if(node->flag & (1<<12)) /* disabled for now since more people seem to want sigs from
unavailable keys removed altogether. */
/*
if(node->flag & (1<<12))
continue; continue;
*/
/* Everything else we delete */ /* Everything else we delete */
/* if 9 or 10 is set, but we get this far, it's superceded, /* At this point, if 12 is set, the signing key was unavailable.
otherwise, it's invalid */ If 9 or 10 is set, it's superceded. Otherwise, it's
invalid. */
if(noisy) if(noisy)
log_info("removing signature from %s on uid \"%s\": %s\n", log_info("removing signature from key %s on user ID \"%s\": %s\n",
keystr(node->pkt->pkt.signature->keyid), keystr(node->pkt->pkt.signature->keyid),
uidnode->pkt->pkt.user_id->name, uidnode->pkt->pkt.user_id->name,
node->flag&(1<<9)?"superceded":"invalid"); node->flag&(1<<12)?"key unavailable":
node->flag&(1<<9)?"signature superceded":"invalid signature");
delete_kbnode(node); delete_kbnode(node);
deleted++; deleted++;