security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-19 09:02:22 +02:00
Code Activity

* trustdb.c (clean_uid_from_key, clean_uids_from_key): Significantly

Browse Source 
simpler implementation.
This commit is contained in:
David Shaw 2005-11-12 03:48:02 +00:00
parent a81633ca7d
commit fe30a112fb
2 changed files with 62 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2005-11-11 David Shaw <dshaw@jabberwocky.com>
* trustdb.c (clean_uid_from_key, clean_uids_from_key):
Significantly simpler implementation.
2005-11-10 David Shaw <dshaw@jabberwocky.com> 2005-11-10 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (keyedit_menu, menu_clean_sigs_from_uids): Add * keyedit.c (keyedit_menu, menu_clean_sigs_from_uids): Add

85
g10/trustdb.c
View File

@ -1653,47 +1653,38 @@ clean_sigs_from_uid(KBNODE keyblock,KBNODE uidnode,int noisy,int self_only)
have to establish if the uid has a valid self-sig, is not revoked, have to establish if the uid has a valid self-sig, is not revoked,
and is not expired. Note that this does not take into account and is not expired. Note that this does not take into account
whether the uid has a trust path to it - just whether the keyholder whether the uid has a trust path to it - just whether the keyholder
themselves has certified the uid. Returns how many user IDs were themselves has certified the uid. Returns true if the uid was
removed. To "remove" a user ID, we simply remove ALL signatures compacted. To "compact" a user ID, we simply remove ALL signatures
except the self-sig that caused the user ID to be remove-worthy. except the self-sig that caused the user ID to be remove-worthy.
We don't actually remove the user ID packet itself since it might We don't actually remove the user ID packet itself since it might
be ressurected in a later merge. be ressurected in a later merge. Note that this function requires
that the caller has already done a merge_keys_and_selfsig().
TODO: change the import code to allow importing a uid with only a TODO: change the import code to allow importing a uid with only a
revocation if the uid already exists on the keyring. */ revocation if the uid already exists on the keyring. */
int
clean_uids_from_key(KBNODE keyblock,int noisy) static int
clean_uid_from_key(KBNODE keyblock,KBNODE uidnode,int noisy)
{ {
int delete_until_next=0,deleting=0,deleted=0;
KBNODE node; KBNODE node;
u32 keyid[2],sigdate=0; PKT_user_id *uid=uidnode->pkt->pkt.user_id;
PKT_user_id *uid=NULL;
assert(keyblock->pkt->pkttype==PKT_PUBLIC_KEY); assert(keyblock->pkt->pkttype==PKT_PUBLIC_KEY);
assert(uidnode->pkt->pkttype==PKT_USER_ID);
keyid_from_pk(keyblock->pkt->pkt.public_key,keyid);
merge_keys_and_selfsig(keyblock);
for(node=keyblock->next;
node && node->pkt->pkttype!=PKT_PUBLIC_SUBKEY;
node=node->next)
{
if(node->pkt->pkttype==PKT_USER_ID)
{
uid=node->pkt->pkt.user_id;
sigdate=0;
/* Skip valid user IDs, and non-self-signed user IDs if /* Skip valid user IDs, and non-self-signed user IDs if
--allow-non-selfsigned-uid is set. */ --allow-non-selfsigned-uid is set. */
if(uid->created if(uid->created || (!uid->is_expired && !uid->is_revoked
|| (!uid->is_expired && !uid->is_revoked
&& opt.allow_non_selfsigned_uid)) && opt.allow_non_selfsigned_uid))
delete_until_next=0; return 0;
else
{ for(node=uidnode->next;
delete_until_next=1; node && node->pkt->pkttype==PKT_SIGNATURE;
deleting=1; node=node->next)
if(!node->pkt->pkt.signature->flags.chosen_selfsig)
delete_kbnode(node);
uid->flags.compacted=1;
if(noisy) if(noisy)
{ {
@ -1708,36 +1699,28 @@ clean_uids_from_key(KBNODE keyblock,int noisy)
reason=_("invalid"); reason=_("invalid");
log_info("compacting user ID \"%s\" on key %s: %s\n", log_info("compacting user ID \"%s\" on key %s: %s\n",
user,keystr(keyblock->pkt->pkt.public_key->keyid), user,keystr_from_pk(keyblock->pkt->pkt.public_key),
reason); reason);
xfree(user); xfree(user);
} }
}
}
else if(node->pkt->pkttype==PKT_SIGNATURE && uid)
{
PKT_signature *sig=node->pkt->pkt.signature;
/* This isn't actually slow - the key signature validation return 1;
is cached from merge_keys_and_selfsig() */ }
if(IS_UID_SIG(sig) && sig->timestamp>sigdate
&& keyid[0]==sig->keyid[0] && keyid[1]==sig->keyid[1]
&& check_key_signature(keyblock,node,NULL)==0)
sigdate=sig->timestamp;
if(delete_until_next && !sig->flags.chosen_selfsig) int
clean_uids_from_key(KBNODE keyblock,int noisy)
{ {
uid->flags.compacted=1; KBNODE uidnode;
delete_kbnode(node); int deleted=0;
if(deleting)
{ merge_keys_and_selfsig(keyblock);
deleted++;
deleting=0; for(uidnode=keyblock->next;
} uidnode && uidnode->pkt->pkttype!=PKT_PUBLIC_SUBKEY;
} uidnode=uidnode->next)
} if(uidnode->pkt->pkttype==PKT_USER_ID)
} deleted+=clean_uid_from_key(keyblock,uidnode,noisy);
return deleted; return deleted;
} }