security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

agent, sm: Set CTX after start_agent.

Browse Source 
* 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 <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-09-27 14:45:21 +09:00
parent 836b723631
commit 4e4843e735
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
g10/call-agent.c
View File

@ -829,7 +829,6 @@ agent_keytocard (const char *hexgrip, int keyno, int force,
struct default_inq_parm_s parm; struct default_inq_parm_s parm;
memset (&parm, 0, sizeof parm); memset (&parm, 0, sizeof parm);
parm.ctx = agent_ctx;
snprintf (line, DIM(line)-1, "KEYTOCARD %s%s %s OPENPGP.%d %s", snprintf (line, DIM(line)-1, "KEYTOCARD %s%s %s OPENPGP.%d %s",
force?"--force ": "", hexgrip, serialno, keyno, timestamp); force?"--force ": "", hexgrip, serialno, keyno, timestamp);
@ -838,6 +837,7 @@ agent_keytocard (const char *hexgrip, int keyno, int force,
rc = start_agent (NULL, 1); rc = start_agent (NULL, 1);
if (rc) if (rc)
return rc; return rc;
parm.ctx = agent_ctx;
rc = assuan_transact (agent_ctx, line, NULL, NULL, default_inq_cb, &parm, rc = assuan_transact (agent_ctx, line, NULL, NULL, default_inq_cb, &parm,
NULL, NULL); NULL, NULL);

41
sm/call-agent.c
View File

@ -228,12 +228,13 @@ gpgsm_agent_pksign (ctrl_t ctrl, const char *keygrip, const char *desc,
char *p, line[ASSUAN_LINELENGTH]; char *p, line[ASSUAN_LINELENGTH];
membuf_t data; membuf_t data;
size_t len; size_t len;
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
*r_buf = NULL; *r_buf = NULL;
rc = start_agent (ctrl); rc = start_agent (ctrl);
if (rc) if (rc)
return rc; return rc;
inq_parm.ctx = agent_ctx;
if (digestlen*2 + 50 > DIM(line)) if (digestlen*2 + 50 > DIM(line))
return gpg_error (GPG_ERR_GENERAL); return gpg_error (GPG_ERR_GENERAL);
@ -301,7 +302,7 @@ gpgsm_scd_pksign (ctrl_t ctrl, const char *keyid, const char *desc,
const char *hashopt; const char *hashopt;
unsigned char *sigbuf; unsigned char *sigbuf;
size_t sigbuflen; size_t sigbuflen;
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
(void)desc; (void)desc;
@ -320,6 +321,7 @@ gpgsm_scd_pksign (ctrl_t ctrl, const char *keyid, const char *desc,
rc = start_agent (ctrl); rc = start_agent (ctrl);
if (rc) if (rc)
return rc; return rc;
inq_parm.ctx = agent_ctx;
if (digestlen*2 + 50 > DIM(line)) if (digestlen*2 + 50 > DIM(line))
return gpg_error (GPG_ERR_GENERAL); return gpg_error (GPG_ERR_GENERAL);
@ -580,12 +582,13 @@ gpgsm_agent_readkey (ctrl_t ctrl, int fromcard, const char *hexkeygrip,
size_t len; size_t len;
unsigned char *buf; unsigned char *buf;
char line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
*r_pubkey = NULL; *r_pubkey = NULL;
rc = start_agent (ctrl); rc = start_agent (ctrl);
if (rc) if (rc)
return rc; return rc;
inq_parm.ctx = agent_ctx;
rc = assuan_transact (agent_ctx, "RESET",NULL, NULL, NULL, NULL, NULL, NULL); rc = assuan_transact (agent_ctx, "RESET",NULL, NULL, NULL, NULL, NULL, NULL);
if (rc) if (rc)
@ -668,12 +671,14 @@ gpgsm_agent_scd_serialno (ctrl_t ctrl, char **r_serialno)
{ {
int rc; int rc;
char *serialno = NULL; char *serialno = NULL;
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
*r_serialno = NULL; *r_serialno = NULL;
rc = start_agent (ctrl); rc = start_agent (ctrl);
if (rc) if (rc)
return rc; return rc;
inq_parm.ctrl = ctrl;
inq_parm.ctx = agent_ctx;
rc = assuan_transact (agent_ctx, "SCD SERIALNO", rc = assuan_transact (agent_ctx, "SCD SERIALNO",
NULL, NULL, NULL, NULL,
@ -738,12 +743,14 @@ gpgsm_agent_scd_keypairinfo (ctrl_t ctrl, strlist_t *r_list)
{ {
int rc; int rc;
strlist_t list = NULL; strlist_t list = NULL;
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
*r_list = NULL; *r_list = NULL;
rc = start_agent (ctrl); rc = start_agent (ctrl);
if (rc) if (rc)
return rc; return rc;
inq_parm.ctrl = ctrl;
inq_parm.ctx = agent_ctx;
rc = assuan_transact (agent_ctx, "SCD LEARN --force", rc = assuan_transact (agent_ctx, "SCD LEARN --force",
NULL, NULL, NULL, NULL,
@ -836,11 +843,13 @@ gpgsm_agent_marktrusted (ctrl_t ctrl, ksba_cert_t cert)
int rc; int rc;
char *fpr, *dn, *dnfmt; char *fpr, *dn, *dnfmt;
char line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
rc = start_agent (ctrl); rc = start_agent (ctrl);
if (rc) if (rc)
return rc; return rc;
inq_parm.ctrl = ctrl;
inq_parm.ctx = agent_ctx;
fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1); fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1);
if (!fpr) if (!fpr)
@ -1023,11 +1032,13 @@ gpgsm_agent_passwd (ctrl_t ctrl, const char *hexkeygrip, const char *desc)
{ {
int rc; int rc;
char line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
rc = start_agent (ctrl); rc = start_agent (ctrl);
if (rc) if (rc)
return rc; return rc;
inq_parm.ctrl = ctrl;
inq_parm.ctx = agent_ctx;
if (!hexkeygrip || strlen (hexkeygrip) != 40) if (!hexkeygrip || strlen (hexkeygrip) != 40)
return gpg_error (GPG_ERR_INV_VALUE); return gpg_error (GPG_ERR_INV_VALUE);
@ -1059,11 +1070,13 @@ gpgsm_agent_get_confirmation (ctrl_t ctrl, const char *desc)
{ {
int rc; int rc;
char line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
rc = start_agent (ctrl); rc = start_agent (ctrl);
if (rc) if (rc)
return rc; return rc;
inq_parm.ctrl = ctrl;
inq_parm.ctx = agent_ctx;
snprintf (line, DIM(line)-1, "GET_CONFIRMATION %s", desc); snprintf (line, DIM(line)-1, "GET_CONFIRMATION %s", desc);
line[DIM(line)-1] = 0; line[DIM(line)-1] = 0;
@ -1170,13 +1183,15 @@ gpgsm_agent_ask_passphrase (ctrl_t ctrl, const char *desc_msg, int repeat,
char line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
char *arg4 = NULL; char *arg4 = NULL;
membuf_t data; membuf_t data;
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
*r_passphrase = NULL; *r_passphrase = NULL;
err = start_agent (ctrl); err = start_agent (ctrl);
if (err) if (err)
return err; return err;
inq_parm.ctrl = ctrl;
inq_parm.ctx = agent_ctx;
if (desc_msg && *desc_msg && !(arg4 = percent_plus_escape (desc_msg))) if (desc_msg && *desc_msg && !(arg4 = percent_plus_escape (desc_msg)))
return gpg_error_from_syserror (); return gpg_error_from_syserror ();
@ -1217,12 +1232,14 @@ gpgsm_agent_keywrap_key (ctrl_t ctrl, int forexport,
size_t len; size_t len;
unsigned char *buf; unsigned char *buf;
char line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
*r_kek = NULL; *r_kek = NULL;
err = start_agent (ctrl); err = start_agent (ctrl);
if (err) if (err)
return err; return err;
inq_parm.ctrl = ctrl;
inq_parm.ctx = agent_ctx;
snprintf (line, DIM(line)-1, "KEYWRAP_KEY %s", snprintf (line, DIM(line)-1, "KEYWRAP_KEY %s",
forexport? "--export":"--import"); forexport? "--export":"--import");
@ -1306,13 +1323,15 @@ gpgsm_agent_export_key (ctrl_t ctrl, const char *keygrip, const char *desc,
size_t len; size_t len;
unsigned char *buf; unsigned char *buf;
char line[ASSUAN_LINELENGTH]; char line[ASSUAN_LINELENGTH];
struct default_inq_parm_s inq_parm = { ctrl, agent_ctx }; struct default_inq_parm_s inq_parm;
*r_result = NULL; *r_result = NULL;
err = start_agent (ctrl); err = start_agent (ctrl);
if (err) if (err)
return err; return err;
inq_parm.ctrl = ctrl;
inq_parm.ctx = agent_ctx;
if (desc) if (desc)
{ {