mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
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.
--
Cherry picked from 2.4 branch of:
853d5b7677
GnuPG-bug-id: 3416
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
cdd6747e1e
commit
4817825511
8 changed files with 32 additions and 26 deletions
|
@ -1783,8 +1783,8 @@ agent_get_s2k_count (unsigned long *r_count)
|
|||
|
||||
|
||||
/* Ask the agent whether a secret key for the given public key is
|
||||
available. Returns 0 if available. */
|
||||
gpg_error_t
|
||||
available. Returns 0 if not available. */
|
||||
int
|
||||
agent_probe_secret_key (ctrl_t ctrl, PKT_public_key *pk)
|
||||
{
|
||||
gpg_error_t err;
|
||||
|
@ -1803,7 +1803,9 @@ agent_probe_secret_key (ctrl_t ctrl, PKT_public_key *pk)
|
|||
xfree (hexgrip);
|
||||
|
||||
err = assuan_transact (agent_ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
|
||||
return err;
|
||||
if (err)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Ask the agent whether a secret key is available for any of the
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue