security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-08 17:43:04 +01:00
Code Activity

* command.c (cmd_pksign, cmd_pkdecrypt): Use a copy of the key ID.

Browse Source
This commit is contained in:
Werner Koch 2002-04-15 10:11:11 +00:00
parent 3719aa5148
commit 4e5bda7655
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scd/ChangeLog
View File

@ -1,3 +1,7 @@
2002-04-15 Werner Koch <wk@gnupg.org>
* command.c (cmd_pksign, cmd_pkdecrypt): Use a copy of the key ID.
2002-04-12 Werner Koch <wk@gnupg.org> 2002-04-12 Werner Koch <wk@gnupg.org>
* scdaemon.c: New option --debug-sc N. * scdaemon.c: New option --debug-sc N.

17
scd/command.c
View File

@ -430,15 +430,23 @@ cmd_pksign (ASSUAN_CONTEXT ctx, char *line)
int rc; int rc;
void *outdata; void *outdata;
size_t outdatalen; size_t outdatalen;
char *keyidstr;
if ((rc = open_card (ctrl))) if ((rc = open_card (ctrl)))
return rc; return rc;
/* We have to use a copy of the key ID because the function may use
the pin_cb which in turn uses the assuan line buffer and thus
overwriting the original line with the keyid */
keyidstr = xtrystrdup (line);
if (!keyidstr)
return ASSUAN_Out_Of_Core;
rc = card_sign (ctrl->card_ctx, rc = card_sign (ctrl->card_ctx,
line, GCRY_MD_SHA1, keyidstr, GCRY_MD_SHA1,
pin_cb, ctx, pin_cb, ctx,
ctrl->in_data.value, ctrl->in_data.valuelen, ctrl->in_data.value, ctrl->in_data.valuelen,
&outdata, &outdatalen); &outdata, &outdatalen);
xfree (keyidstr);
if (rc) if (rc)
{ {
log_error ("card_sign failed: %s\n", gnupg_strerror (rc)); log_error ("card_sign failed: %s\n", gnupg_strerror (rc));
@ -464,15 +472,20 @@ cmd_pkdecrypt (ASSUAN_CONTEXT ctx, char *line)
int rc; int rc;
void *outdata; void *outdata;
size_t outdatalen; size_t outdatalen;
char *keyidstr;
if ((rc = open_card (ctrl))) if ((rc = open_card (ctrl)))
return rc; return rc;
keyidstr = xtrystrdup (line);
if (!keyidstr)
return ASSUAN_Out_Of_Core;
rc = card_decipher (ctrl->card_ctx, rc = card_decipher (ctrl->card_ctx,
line, keyidstr,
pin_cb, ctx, pin_cb, ctx,
ctrl->in_data.value, ctrl->in_data.valuelen, ctrl->in_data.value, ctrl->in_data.valuelen,
&outdata, &outdatalen); &outdata, &outdatalen);
xfree (keyidstr);
if (rc) if (rc)
{ {
log_error ("card_create_signature failed: %s\n", gnupg_strerror (rc)); log_error ("card_create_signature failed: %s\n", gnupg_strerror (rc));