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: Use SETDATA --apend for larger data to communicate scdaemon.

Browse Source 
* agent/call-scd.c (prepare_setdata): New.
(agent_card_pksign): Use prepare_setdata for SETDATA.
(agent_card_pkdecrypt): Likewise.

--

GnuPG-bug-id: 7436
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-12-05 15:31:23 +09:00
parent c3bab200d9
commit fe147645d2
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
agent/call-scd.c
View File

@ -471,6 +471,33 @@ hash_algo_option (int algo)
} }
static int
prepare_setdata (ctrl_t ctrl, const unsigned char *indata, size_t indatalen)
{
int rc;
char *p, line[ASSUAN_LINELENGTH];
size_t len;
int i;
for (len = 0; len < indatalen;)
{
p = stpcpy (line, "SETDATA ");
if (len)
p = stpcpy (p, "--append ");
for (i=0; len < indatalen && (i*2 < DIM(line)-50); i++, len++)
{
sprintf (p, "%02X", indata[len]);
p += 2;
}
rc = assuan_transact (daemon_ctx (ctrl), line,
NULL, NULL, NULL, NULL, NULL, NULL);
if (rc)
return rc;
}
return 0;
}
/* Create a signature using the current card. MDALGO is either 0 or /* Create a signature using the current card. MDALGO is either 0 or
* gives the digest algorithm. DESC_TEXT is an additional parameter * gives the digest algorithm. DESC_TEXT is an additional parameter
* passed to GETPIN_CB. */ * passed to GETPIN_CB. */
@ -500,13 +527,7 @@ agent_card_pksign (ctrl_t ctrl,
if (!mdalgo) if (!mdalgo)
return gpg_error (GPG_ERR_NOT_IMPLEMENTED); return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
if (indatalen*2 + 50 > DIM(line)) rc = prepare_setdata (ctrl, indata, indatalen);
return unlock_scd (ctrl, gpg_error (GPG_ERR_GENERAL));
bin2hex (indata, indatalen, stpcpy (line, "SETDATA "));
rc = assuan_transact (daemon_ctx (ctrl), line,
NULL, NULL, NULL, NULL, pincache_put_cb, NULL);
if (rc) if (rc)
return unlock_scd (ctrl, rc); return unlock_scd (ctrl, rc);
@ -594,21 +615,9 @@ agent_card_pkdecrypt (ctrl_t ctrl,
/* FIXME: use secure memory where appropriate */ /* FIXME: use secure memory where appropriate */
for (len = 0; len < indatalen;) rc = prepare_setdata (ctrl, indata, indatalen);
{ if (rc)
p = stpcpy (line, "SETDATA "); return unlock_scd (ctrl, rc);
if (len)
p = stpcpy (p, "--append ");
for (i=0; len < indatalen && (i*2 < DIM(line)-50); i++, len++)
{
sprintf (p, "%02X", indata[len]);
p += 2;
}
rc = assuan_transact (daemon_ctx (ctrl), line,
NULL, NULL, NULL, NULL, NULL, NULL);
if (rc)
return unlock_scd (ctrl, rc);
}
init_membuf (&data, 1024); init_membuf (&data, 1024);
inqparm.ctx = daemon_ctx (ctrl); inqparm.ctx = daemon_ctx (ctrl);