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

Fix bug 894.

Browse source 
Change default keyserver.
Allow key protection with Camellia.
This commit is contained in:
Werner Koch 2008-03-25 08:33:31 +00:00
parent c2a8254be7
commit d7f0b3bd89
5 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
g10/import.c
View file

@ -1661,11 +1661,17 @@ collapse_uids( KBNODE *keyblock )
{
KBNODE uid2;
if(is_deleted_kbnode(uid1))
continue;
if(uid1->pkt->pkttype!=PKT_USER_ID)
continue;
for(uid2=uid1->next;uid2;uid2=uid2->next)
{
if(is_deleted_kbnode(uid2))
continue;
if(uid2->pkt->pkttype!=PKT_USER_ID)
continue;
@ -1681,6 +1687,9 @@ collapse_uids( KBNODE *keyblock )
uid1 */
for(last=uid2;last->next;last=last->next)
{
if(is_deleted_kbnode(last))
continue;
if(last->next->pkt->pkttype==PKT_USER_ID
|| last->next->pkt->pkttype==PKT_PUBLIC_SUBKEY
|| last->next->pkt->pkttype==PKT_SECRET_SUBKEY)
@ -1693,13 +1702,16 @@ collapse_uids( KBNODE *keyblock )
/* Now put uid2 in place as part of uid1 */
last->next=uid1->next;
uid1->next=uid2;
remove_kbnode(keyblock,uid2);
delete_kbnode(uid2);
/* Now dedupe uid1 */
for(sig1=uid1->next;sig1;sig1=sig1->next)
{
KBNODE sig2;
if(is_deleted_kbnode(sig1))
continue;
if(sig1->pkt->pkttype==PKT_USER_ID
|| sig1->pkt->pkttype==PKT_PUBLIC_SUBKEY
|| sig1->pkt->pkttype==PKT_SECRET_SUBKEY)
@ -1710,6 +1722,9 @@ collapse_uids( KBNODE *keyblock )
for(sig2=sig1->next,last=sig1;sig2;last=sig2,sig2=sig2->next)
{
if(is_deleted_kbnode(sig2))
continue;
if(sig2->pkt->pkttype==PKT_USER_ID
|| sig2->pkt->pkttype==PKT_PUBLIC_SUBKEY
|| sig2->pkt->pkttype==PKT_SECRET_SUBKEY)
@ -1723,7 +1738,7 @@ collapse_uids( KBNODE *keyblock )
{
/* We have a match, so delete the second
signature */
remove_kbnode(&uid1,sig2);
delete_kbnode(sig2);
sig2=last;
}
}
@ -1732,6 +1747,8 @@ collapse_uids( KBNODE *keyblock )
}
}
commit_kbnode(keyblock);
if(any && !opt.quiet)
{
const char *key="???";