security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-22 15:11:41 +02:00
Code Activity

* keyedit.c (ask_revoke_sig): Add a revsig --with-colons mode.

Browse Source 
Suggested by Michael Schierl.
This commit is contained in:
David Shaw 2005-08-27 02:56:51 +00:00
parent aec65a94d8
commit 752d64bffc
2 changed files with 31 additions and 9 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-08-26 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (ask_revoke_sig): Add a revsig --with-colons mode.
Suggested by Michael Schierl.
2005-08-21 David Shaw <dshaw@jabberwocky.com> 2005-08-21 David Shaw <dshaw@jabberwocky.com>
* Makefile.am: No need to link with curl any longer. * Makefile.am: No need to link with curl any longer.

25
g10/keyedit.c
View File

@ -2377,7 +2377,6 @@ show_prefs (PKT_user_id *uid, PKT_signature *selfsig, int verbose)
} }
} }
/* This is the version of show_key_with_all_names used when /* This is the version of show_key_with_all_names used when
opt.with_colons is used. It prints all available data in a easy to opt.with_colons is used. It prints all available data in a easy to
parse format and does not translate utf8 */ parse format and does not translate utf8 */
@ -4189,7 +4188,7 @@ static void
ask_revoke_sig( KBNODE keyblock, KBNODE node ) ask_revoke_sig( KBNODE keyblock, KBNODE node )
{ {
int doit=0; int doit=0;
char *p; PKT_user_id *uid;
PKT_signature *sig = node->pkt->pkt.signature; PKT_signature *sig = node->pkt->pkt.signature;
KBNODE unode = find_prev_kbnode( keyblock, node, PKT_USER_ID ); KBNODE unode = find_prev_kbnode( keyblock, node, PKT_USER_ID );
@ -4198,7 +4197,25 @@ ask_revoke_sig( KBNODE keyblock, KBNODE node )
return; return;
} }
p=utf8_to_native(unode->pkt->pkt.user_id->name, uid=unode->pkt->pkt.user_id;
if(opt.with_colons)
{
if(uid->attrib_data)
printf("uat:::::::::%u %lu",uid->numattribs,uid->attrib_len);
else
{
printf("uid:::::::::");
print_string (stdout, uid->name, uid->len, ':');
}
printf("\n");
print_and_check_one_sig_colon(keyblock,node,NULL,NULL,NULL,NULL,1);
}
else
{
char *p=utf8_to_native(unode->pkt->pkt.user_id->name,
unode->pkt->pkt.user_id->len,0); unode->pkt->pkt.user_id->len,0);
tty_printf(_("user ID: \"%s\"\n"),p); tty_printf(_("user ID: \"%s\"\n"),p);
xfree(p); xfree(p);
@ -4206,7 +4223,7 @@ ask_revoke_sig( KBNODE keyblock, KBNODE node )
tty_printf(_("signed by your key %s on %s%s%s\n"), tty_printf(_("signed by your key %s on %s%s%s\n"),
keystr(sig->keyid),datestr_from_sig(sig), keystr(sig->keyid),datestr_from_sig(sig),
sig->flags.exportable?"":_(" (non-exportable)"),""); sig->flags.exportable?"":_(" (non-exportable)"),"");
}
if(sig->flags.expired) if(sig->flags.expired)
{ {
tty_printf(_("This signature expired on %s.\n"), tty_printf(_("This signature expired on %s.\n"),