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

10
g10/import.c
View file

@ -555,11 +555,10 @@ print_import_ok (PKT_public_key *pk, PKT_secret_key *sk, unsigned int reason)
write_status_text (STATUS_IMPORT_OK, buf);
}
void
print_import_check (PKT_public_key * pk, PKT_user_id * id)
{
char * buf, * p;
char * buf;
byte fpr[24];
u32 keyid[2];
size_t i, pos = 0, n;
@ -573,14 +572,11 @@ print_import_check (PKT_public_key * pk, PKT_user_id * id)
sprintf (buf+pos, "%02X", fpr[i]);
strcat (buf, " ");
pos += 1;
p = native_to_utf8 (id->name);
strcat (buf, p);
strcat (buf, id->name);
write_status_text (STATUS_IMPORT_CHECK, buf);
m_free (buf);
m_free (p);
}
/****************
* Try to import one keyblock. Return an error only in serious cases, but
* never for an invalid keyblock. It uses log_error to increase the
@ -632,7 +628,7 @@ import_one( const char *fname, KBNODE keyblock,
if (opt.interactive) {
if(is_status_enabled())
print_import_check (pk, uidnode->pkt->pkt.user_id);
merge_keys_and_selfsig (keyblock);
merge_keys_and_selfsig (keyblock);
tty_printf ("\n");
show_basic_key_info (keyblock);
tty_printf ("\n");