diff options
| author | David Shaw <[email protected]> | 2004-12-15 05:16:53 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-12-15 05:16:53 +0000 |
| commit | 7a388529a3185f96f3af98072f345f266eb37870 (patch) | |
| tree | f93e3914104811680aa8e0e09b95e21bb05233c0 /g10/trustdb.c | |
| parent | * keyedit.c (keyedit_menu): Re-remove the N_() markers. (diff) | |
| download | gnupg-7a388529a3185f96f3af98072f345f266eb37870.tar.gz gnupg-7a388529a3185f96f3af98072f345f266eb37870.zip | |
* apdu.c (apdu_send_le, apdu_send_direct), keylist.c
(status_one_subpacket, print_one_subpacket): Fix some compiler warnings.
* g10.c (main): Fix --compression-algo to take a string argument like
--compress-algo.
* trustdb.c (uid_trust_string_fixed): For safety, check for a pk.
Diffstat (limited to '')
| -rw-r--r-- | g10/trustdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c index ca4c4209d..8dccef7a9 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -502,11 +502,11 @@ uid_trust_string_fixed(PKT_public_key *key,PKT_user_id *uid) { if(!key && !uid) return _("10 translator see trustdb.c:uid_trust_string_fixed"); - else if(uid->is_revoked || key->is_revoked) + else if(uid->is_revoked || (key && key->is_revoked)) return _("[ revoked]"); else if(uid->is_expired) return _("[ expired]"); - else + else if(key) switch(get_validity(key,uid)&TRUST_MASK) { case TRUST_UNKNOWN: return _("[ unknown]"); |