diff options
| author | NIIBE Yutaka <[email protected]> | 2020-01-17 06:11:02 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2020-01-17 07:09:01 +0000 |
| commit | 853d5b7677ea01f65c9bc5160cd8509b62f486f7 (patch) | |
| tree | 848bb0adc423a9abbd67d716a641eb6b7849815f /g10/keyedit.c | |
| parent | card: Allow switching of cards and applications. (diff) | |
| download | gnupg-853d5b7677ea01f65c9bc5160cd8509b62f486f7.tar.gz gnupg-853d5b7677ea01f65c9bc5160cd8509b62f486f7.zip | |
gpg: Prepare enhancement of agent_probe_secret_key.
* g10/call-agent.c (agent_probe_secret_key): Change semantics of
return value.
* g10/call-agent.h (agent_probe_secret_key): Change comment.
* g10/delkey.c (do_delete_key): Follow the change.
* g10/getkey.c (get_seckey, parse_def_secret_key): Likewise.
(finish_lookup, have_secret_key_with_kid): Likewise.
* g10/gpgv.c (agent_probe_secret_key): Likewise.
* g10/keyedit.c (keyedit_menu, quick_find_keyblock): Likewise.
(show_key_with_all_names_colon): Likewise.
* g10/revoke.c (gen_desig_revoke, gen_revoke): Likewise
* g10/test-stubs.c (agent_probe_secret_key): Likewise.
--
GnuPG-bug-id: 3416
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index 2ac52d315..1391b6b7a 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1454,7 +1454,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr, { have_anyseckey = !agent_probe_any_secret_key (ctrl, keyblock); if (have_anyseckey - && !agent_probe_secret_key (ctrl, keyblock->pkt->pkt.public_key)) + && agent_probe_secret_key (ctrl, keyblock->pkt->pkt.public_key)) { /* The primary key is also available. */ have_seckey = 1; @@ -2324,7 +2324,8 @@ quick_find_keyblock (ctrl_t ctrl, const char *username, /* We require the secret primary key to set the primary UID. */ node = find_kbnode (keyblock, PKT_PUBLIC_KEY); log_assert (node); - err = agent_probe_secret_key (ctrl, node->pkt->pkt.public_key); + if (!agent_probe_secret_key (ctrl, node->pkt->pkt.public_key)) + err = gpg_error (GPG_ERR_NO_SECKEY); } } else if (gpg_err_code (err) == GPG_ERR_NOT_FOUND) @@ -3229,7 +3230,7 @@ show_key_with_all_names_colon (ctrl_t ctrl, estream_t fp, kbnode_t keyblock) } keyid_from_pk (pk, keyid); - have_seckey = !agent_probe_secret_key (ctrl, pk); + have_seckey = agent_probe_secret_key (ctrl, pk); if (node->pkt->pkttype == PKT_PUBLIC_KEY) es_fputs (have_seckey? "sec:" : "pub:", fp); |