diff options
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 54 |
1 files changed, 45 insertions, 9 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index df1b896cd..ec19d9b54 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -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 ) { |