diff options
| author | David Shaw <[email protected]> | 2002-10-29 18:00:07 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-10-29 18:00:07 +0000 |
| commit | 809b8b031a3482d12faefa5ce9f392c1688eaa81 (patch) | |
| tree | b9de81d600d52f51da3be66ad3d79cf723f35534 /g10/keylist.c | |
| parent | tidied RISC OS filetype support (diff) | |
| download | gnupg-809b8b031a3482d12faefa5ce9f392c1688eaa81.tar.gz gnupg-809b8b031a3482d12faefa5ce9f392c1688eaa81.zip | |
* keyedit.c (print_and_check_one_sig, show_key_and_fingerprint,
menu_addrevoker), keylist.c (list_keyblock_print, print_fingerprint): Show
"T" or the trust depth for trust signatures, and add spaces to some
strings to make room for it.
* packet.h, parse-packet.c (dump_sig_subpkt, parse_one_sig_subpkt,
parse_signature): Parse trust signature values.
* tdbio.h, tdbio.c (tdbio_read_record, tdbio_write_record): Reserve a byte
for the minimum ownertrust value (for use with trust signatures).
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index e33f000dd..b45bfca0f 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -476,7 +476,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque ) pk = node->pkt->pkt.public_key; sk = NULL; keyid_from_pk( pk, keyid ); - printf("pub %4u%c/%08lX %s ", nbits_from_pk( pk ), + printf("pub %4u%c/%08lX %s ", nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ), (ulong)keyid[1], datestr_from_pk( pk ) ); @@ -528,7 +528,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque ) } keyid_from_pk( pk2, keyid2 ); - printf("sub %4u%c/%08lX %s", nbits_from_pk( pk2 ), + printf("sub %4u%c/%08lX %s", nbits_from_pk( pk2 ), pubkey_letter( pk2->pubkey_algo ), (ulong)keyid2[1], datestr_from_pk( pk2 ) ); @@ -620,7 +620,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque ) } fputs( sigstr, stdout ); - printf("%c%c %c%c%c%c%c %08lX %s ", + printf("%c%c %c%c%c%c%c%c %08lX %s ", sigrc,(sig->sig_class-0x10>0 && sig->sig_class-0x10<4)?'0'+sig->sig_class-0x10:' ', sig->flags.exportable?' ':'L', @@ -628,6 +628,8 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque ) sig->flags.policy_url?'P':' ', sig->flags.notation?'N':' ', sig->flags.expired?'X':' ', + (sig->trust_depth>9)?'T': + (sig->trust_depth>0)?'0'+sig->trust_depth:' ', (ulong)sig->keyid[1], datestr_from_sig(sig)); if( sigrc == '%' ) printf("[%s] ", g10_errstr(rc) ); @@ -1073,11 +1075,11 @@ print_fingerprint (PKT_public_key *pk, PKT_secret_key *sk, int mode ) } else if (mode == 3) { fp = NULL; /* use tty */ - text = _(" Key fingerprint ="); + text = _(" Key fingerprint ="); } else { fp = stdout; - text = _(" Key fingerprint ="); + text = _(" Key fingerprint ="); } if (sk) |