aboutsummaryrefslogtreecommitdiffstats
path: root/g10/mainproc.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2003-01-27 21:49:37 +0000
committerDavid Shaw <[email protected]>2003-01-27 21:49:37 +0000
commit2659e53b6ecc2404209c500cc8e952214ff4924f (patch)
tree7a63e19b615c791dfb0207aed328c01553601704 /g10/mainproc.c
parent* g10.c (add_group): Trim whitespace after a group name so it does not (diff)
downloadgnupg-2659e53b6ecc2404209c500cc8e952214ff4924f.tar.gz
gnupg-2659e53b6ecc2404209c500cc8e952214ff4924f.zip
* mainproc.c (list_node): Show signature expiration date in with-colons
sig records. * keylist.c (list_keyblock_colon), mainproc.c (list_node): Show trust sig information in with-colons sig records.
Diffstat (limited to 'g10/mainproc.c')
-rw-r--r--g10/mainproc.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 49fd217cb..c7da91b64 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1019,9 +1019,19 @@ list_node( CTX c, KBNODE node )
putchar(':');
if( sigrc != ' ' )
putchar(sigrc);
- printf("::%d:%08lX%08lX:%s::::", sig->pubkey_algo,
- (ulong)sig->keyid[0],
- (ulong)sig->keyid[1], colon_datestr_from_sig(sig));
+ printf("::%d:%08lX%08lX:%s:%s:", sig->pubkey_algo,
+ (ulong)sig->keyid[0], (ulong)sig->keyid[1],
+ colon_datestr_from_sig(sig),
+ colon_expirestr_from_sig(sig));
+
+ if(sig->trust_depth || sig->trust_value)
+ printf("%d %d",sig->trust_depth,sig->trust_value);
+ printf(":");
+
+ if(sig->trust_regexp)
+ print_string(stdout,sig->trust_regexp,
+ strlen(sig->trust_regexp),':');
+ printf(":");
}
else
printf("%c %08lX %s ",