diff options
author | NIIBE Yutaka <[email protected]> | 2018-07-12 08:09:14 +0000 |
---|---|---|
committer | NIIBE Yutaka <[email protected]> | 2018-07-12 08:09:14 +0000 |
commit | e8caa282d3d5f286919a1ed3db6699c555b7e89d (patch) | |
tree | 1762014bacef69c542923f55dfe83a2f925d7999 /g10/pkclist.c | |
parent | g10: Fix enum_secret_keys for card keys. (diff) | |
parent | gpg: Remove multiple subkey bindings during export-clean. (diff) | |
download | gnupg-gniibe/decryption-key.tar.gz gnupg-gniibe/decryption-key.zip |
Merge branch 'master' into gniibe/decryption-keygniibe/decryption-key
Diffstat (limited to 'g10/pkclist.c')
-rw-r--r-- | g10/pkclist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index 6aec13882..e7484432a 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -113,7 +113,7 @@ void show_revocation_reason (ctrl_t ctrl, PKT_public_key *pk, int mode) { /* Hmmm, this is not so easy because we have to duplicate the code - * used in the trustbd to calculate the keyflags. We need to find + * used in the trustdb to calculate the keyflags. We need to find * a clean way to check revocation certificates on keys and * signatures. And there should be no duplicate code. Because we * enter this function only when the trustdb told us that we have @@ -548,7 +548,7 @@ check_signatures_trust (ctrl_t ctrl, PKT_signature *sig) unsigned int trustlevel = TRUST_UNKNOWN; int rc=0; - rc = get_pubkey (ctrl, pk, sig->keyid ); + rc = get_pubkey_for_sig (ctrl, pk, sig); if (rc) { /* this should not happen */ log_error("Ooops; the key vanished - can't check the trust\n"); |