security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* misc.c (compress_algo_to_string): Return NULL on failure like all of the

Browse source 
other xxxx_algo_to_string() functions.

* mainproc.c (list_node): Minor spacing tweak to match --list-keys output.

* keylist.c (list_keyblock_print), mainproc.c (list_node): Mark revoked
subkeys as revoked.  Requested by Matthew Wilcox.  Make revoked and
expired tags translatable (they are already translated elsewhere).
Revoked overrides expiration when both apply.

* keyedit.c (show_prefs): Use compress algo constants.
(show_basic_key_info): Make revoked and expired tags translatable
(show_key_with_all_names): Revoked overrides expired when both apply.
This commit is contained in:
David Shaw 2004-02-10 03:38:15 +00:00
parent d0a1aaa277
commit 8890842012
5 changed files with 53 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
g10/mainproc.c
View file

@ -1,6 +1,6 @@
/* mainproc.c - handle packets
* Copyright (C) 1998, 1999, 2000, 2001, 2002,
* 2003 Free Software Foundation, Inc.
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
* 2004 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -881,12 +881,13 @@ list_node( CTX c, KBNODE node )
}
}
else
printf("%s %4u%c/%08lX %s ",
printf("%s %4u%c/%08lX %s%s",
mainkey? "pub":"sub",
nbits_from_pk( pk ),
pubkey_letter( pk->pubkey_algo ),
(ulong)keyid_from_pk( pk, NULL ),
datestr_from_pk( pk ) );
datestr_from_pk( pk ),
mainkey?" ":"");
if( mainkey ) {
/* and now list all userids with their signatures */
@ -931,9 +932,14 @@ list_node( CTX c, KBNODE node )
}
}
}
else if( pk->expiredate ) { /* of subkey */
printf(_(" [expires: %s]"), expirestr_from_pk( pk ) );
}
else
{
/* of subkey */
if( pk->is_revoked )
printf(" %s",_("[revoked] "));
else if( pk->expiredate )
printf(_(" [expires: %s]"), expirestr_from_pk( pk ) );
}
if( !any )
putchar('\n');