diff options
| author | David Shaw <[email protected]> | 2003-09-30 15:30:39 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-09-30 15:30:39 +0000 |
| commit | 52100b459af3a033b095018da9e67d54497aa325 (patch) | |
| tree | d2be9f7a416d5bcd610aa7adb062647f7e78c5ab /g10/keylist.c | |
| parent | * keygen.c (do_add_key_flags, parse_parameter_usage): Add support (diff) | |
| download | gnupg-52100b459af3a033b095018da9e67d54497aa325.tar.gz gnupg-52100b459af3a033b095018da9e67d54497aa325.zip | |
* gpgv.c (check_trustdb_stale): Stub.
* trustdb.c (get_validity): Move the up-to-date check to
check_trustdb_stale (new), so that it can be called before validity is
checked.
* keylist.c (list_keyblock_print): Disable the overall key validity
display until it can be thought about more. Use check_trustdb_stale here
to avoid putting the check warning in the middle of a listed key.
* trustdb.c (init_trustdb): Only verify_own_keys() for those trust models
that it applies to (i.e. classic and OpenPGP).
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index de5b57572..9970f0cb2 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -622,12 +622,18 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque ) } else { +#if 0 int validity; +#endif pk = node->pkt->pkt.public_key; sk = NULL; keyid_from_pk( pk, keyid ); +#if 0 validity=get_validity(pk,NULL); +#endif + + check_trustdb_stale(); printf("pub %4u%c/", nbits_from_pk(pk),pubkey_letter(pk->pubkey_algo)); @@ -644,8 +650,13 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque ) if(newformat && pk->expiredate) printf(_(" [expires: %s]"), expirestr_from_pk( pk ) ); +#if 0 + /* I need to think about this some more. It's easy enough to + include, but it looks sort of confusing in the + listing... */ if(opt.list_options&LIST_SHOW_VALIDITY) printf(" [%s]",trust_value_to_string(validity)); +#endif } for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) { |