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

* keyedit.c (menu_revuid): Properly handle a nonselfsigned uid on a v4 key

Browse source 
(treat as a v4 revocation).

* import.c (print_import_check): Do not re-utf8 convert user IDs.
This commit is contained in:
David Shaw 2003-02-02 15:47:43 +00:00
parent 169f4365da
commit 6291f18371
3 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
g10/keyedit.c
View file

@ -3352,8 +3352,8 @@ menu_revuid( KBNODE pub_keyblock, KBNODE sec_keyblock )
probably be safe to use v4 revocations everywhere. -ds */
for( node = pub_keyblock; node; node = node->next )
if(node->pkt->pkttype==PKT_USER_ID &&
node->pkt->pkt.user_id->selfsigversion>3)
if(pk->version>3 || (node->pkt->pkttype==PKT_USER_ID &&
node->pkt->pkt.user_id->selfsigversion>3))
{
if((reason = ask_revocation_reason( 0, 1, 4 )))
break;
@ -3413,13 +3413,11 @@ menu_revuid( KBNODE pub_keyblock, KBNODE sec_keyblock )
pkt->pkt.signature = sig;
insert_kbnode( node, new_kbnode(pkt), 0 );
if(!update_trust)
{
/* If the trustdb has an entry for this key+uid then the
trustdb needs an update. */
if((get_validity(pk,uid)&TRUST_MASK)>=TRUST_UNDEFINED)
update_trust=1;
}
/* If the trustdb has an entry for this key+uid then the
trustdb needs an update. */
if(!update_trust
&& (get_validity(pk,uid)&TRUST_MASK)>=TRUST_UNDEFINED)
update_trust=1;
changed = 1;
node->pkt->pkt.user_id->is_revoked=1;