diff options
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index f874b2d64..e4c9e6e84 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -778,19 +778,13 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque ) const char *validity; int indent; - if(uid->is_revoked) - validity=_("revoked"); - else if(uid->is_expired) - validity=_("expired"); - else - validity=trust_value_to_string(get_validity(pk,uid)); - - indent=(keystrlen()+7)-strlen(validity); + validity=uid_trust_string_fixed(pk,uid); + indent=(keystrlen()+9)-atoi(uid_trust_string_fixed(NULL,NULL)); - if(indent<0) + if(indent<0 || indent>40) indent=0; - printf("uid%*s[%s] ",indent,"",validity); + printf("uid%*s%s ",indent,"",validity); } else printf("uid%*s",keystrlen()+10,""); |