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, keylist.c, keyserver.c, mainproc.c: The

Browse source 
revoked/expired/expires string change of 2004-09-29 was too simple.  Use
two styles for each tag.
This commit is contained in:
David Shaw 2004-10-06 19:51:45 +00:00
parent 8c72ff9543
commit 8da1dfeed0
5 changed files with 74 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

54
g10/keylist.c
View file

@ -668,9 +668,17 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
keystr_from_sk(sk),datestr_from_sk( sk ));
if(sk->has_expired)
printf(" [%s: %s]",_("expired"),expirestr_from_sk( sk ) );
{
printf(" [");
printf(_("expired: %s"),expirestr_from_sk(sk));
printf("]");
}
else if(sk->expiredate )
printf(" [%s: %s]",_("expires"),expirestr_from_sk( sk ) );
{
printf(" [");
printf(_("expires: %s"),expirestr_from_sk(sk));
printf("]");
}
printf("\n");
}
@ -689,11 +697,23 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
is room in the new format, so why not? */
if(pk->is_revoked)
printf(" [%s: %s]",_("revoked"),revokestr_from_pk( pk ) );
{
printf(" [");
printf(_("revoked: %s"),revokestr_from_pk(pk));
printf("]");
}
else if(pk->has_expired)
printf(" [%s: %s]",_("expired"),expirestr_from_pk( pk ) );
{
printf(" [");
printf(_("expired: %s)"),expirestr_from_pk(pk));
printf("]");
}
else if(pk->expiredate)
printf(" [%s: %s]",_("expires"),expirestr_from_pk( pk ) );
{
printf(" [");
printf(_("expires: %s"),expirestr_from_pk(pk));
printf("]");
}
#if 0
/* I need to think about this some more. It's easy enough to
@ -787,11 +807,23 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
nbits_from_pk( pk2 ),pubkey_letter( pk2->pubkey_algo ),
keystr_from_pk(pk2),datestr_from_pk(pk2));
if( pk2->is_revoked )
printf(" [%s: %s]",_("revoked"),revokestr_from_pk(pk2));
{
printf(" [");
printf(_("revoked: %s"),revokestr_from_pk(pk2));
printf("]");
}
else if( pk2->has_expired )
printf(" [%s: %s]",_("expired"),expirestr_from_pk(pk2));
{
printf(" [");
printf(_("expired: %s"),expirestr_from_pk(pk2));
printf("]");
}
else if( pk2->expiredate )
printf(" [%s: %s]",_("expires"),expirestr_from_pk(pk2));
{
printf(" [");
printf(_("expires: %s"),expirestr_from_pk(pk2));
printf("]");
}
putchar('\n');
if( fpr > 1 )
print_fingerprint( pk2, NULL, 0 );
@ -817,7 +849,11 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
nbits_from_sk( sk2 ),pubkey_letter( sk2->pubkey_algo ),
keystr_from_sk(sk2),datestr_from_sk( sk2 ) );
if( sk2->expiredate )
printf(" [%s: %s]",_("expires"), expirestr_from_sk( sk2 ) );
{
printf(" [");
printf(_("expires: %s"),expirestr_from_sk(sk2));
printf("]");
}
putchar('\n');
if( fpr > 1 )
{