diff options
| author | David Shaw <[email protected]> | 2003-01-27 21:49:37 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-01-27 21:49:37 +0000 |
| commit | 2659e53b6ecc2404209c500cc8e952214ff4924f (patch) | |
| tree | 7a63e19b615c791dfb0207aed328c01553601704 | |
| parent | * g10.c (add_group): Trim whitespace after a group name so it does not (diff) | |
| download | gnupg-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 '')
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/keylist.c | 18 | ||||
| -rw-r--r-- | g10/mainproc.c | 16 |
3 files changed, 35 insertions, 7 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index bd9978ccb..ed892b167 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2003-01-27 David Shaw <[email protected]> + + * 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. + 2003-01-16 David Shaw <[email protected]> * g10.c (add_group): Trim whitespace after a group name so it does diff --git a/g10/keylist.c b/g10/keylist.c index 2d416d004..0eb321d71 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -938,10 +938,20 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr ) putchar(':'); if( sigrc != ' ' ) putchar(sigrc); - 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)); + 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(":"); + if( sigrc == '%' ) printf("[%s] ", g10_errstr(rc) ); else if( sigrc == '?' ) 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 ", |