diff options
| author | NIIBE Yutaka <[email protected]> | 2016-09-27 05:45:21 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2016-09-27 05:45:21 +0000 |
| commit | 4e4843e735f32b5e79a51d8062da55bfaab6ad77 (patch) | |
| tree | 32551fc764650052a74aed365ae49f0b7cbabdf4 /g10/call-agent.c | |
| parent | dirmngr: Removal of no-libgcrypt.o. (diff) | |
| download | gnupg-4e4843e735f32b5e79a51d8062da55bfaab6ad77.tar.gz gnupg-4e4843e735f32b5e79a51d8062da55bfaab6ad77.zip | |
agent, sm: Set CTX after start_agent.
* g10/call-agent.c (agent_keytocard): Assign parm.ctx after start_agent.
* sm/call-agent.c (gpgsm_agent_pksign, gpgsm_scd_pksign)
(gpgsm_agent_readkey, gpgsm_agent_scd_serialno)
(gpgsm_agent_scd_keypairinfo, gpgsm_agent_marktrusted)
(gpgsm_agent_passwd, gpgsm_agent_get_confirmation)
(gpgsm_agent_ask_passphrase, gpgsm_agent_keywrap_key)
(gpgsm_agent_export_key): Likewise.
--
Reported-by: Rainer Perske
GnuPG-bug-id: 2699
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/call-agent.c')
| -rw-r--r-- | g10/call-agent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/call-agent.c b/g10/call-agent.c index a023654bc..93c9b5636 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -829,7 +829,6 @@ agent_keytocard (const char *hexgrip, int keyno, int force, struct default_inq_parm_s parm; memset (&parm, 0, sizeof parm); - parm.ctx = agent_ctx; snprintf (line, DIM(line)-1, "KEYTOCARD %s%s %s OPENPGP.%d %s", force?"--force ": "", hexgrip, serialno, keyno, timestamp); @@ -838,6 +837,7 @@ agent_keytocard (const char *hexgrip, int keyno, int force, rc = start_agent (NULL, 1); if (rc) return rc; + parm.ctx = agent_ctx; rc = assuan_transact (agent_ctx, line, NULL, NULL, default_inq_cb, &parm, NULL, NULL); |