mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg: Keep the integrity of the code for KEYINFO command.
* g10/call-agent.c (struct keyinfo_data_parm_s): Remove CARD_AVAILABLE field. (keyinfo_status_cb): Don't touch CARD_AVAILABLE field. (agent_probe_secret_key); Don't check CARD_AVAILABLE field. * g10/import.c (do_transfer): Check if it's card key or not. -- In 2.2 branch, gpg-agent doesn't have a capability to report if card is available or not by KEYINFO command. Thus, this clean up. GnuPG-bug-id: 3456 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
ff42ed0d69
commit
8e3d4f5b63
2 changed files with 1 additions and 7 deletions
|
@ -2839,7 +2839,7 @@ do_transfer (ctrl_t ctrl, kbnode_t keyblock, PKT_public_key *pk,
|
|||
int force = 0;
|
||||
int already_exist = agent_probe_secret_key (ctrl, pk);
|
||||
|
||||
if (already_exist == 2 || already_exist == 4)
|
||||
if (already_exist == 2)
|
||||
{
|
||||
if (!opt.quiet)
|
||||
log_info (_("key %s: card reference is overridden by key material\n"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue