security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

Fixed gpg-agent SCD inquire command cancellation. 

Need to send the CANCEL command back to scdaemon otherwise the next SCD
command will fail.
This commit is contained in:
Ben Kibbey 2011-07-09 08:25:22 -04:00 committed by Werner Koch
parent 6f86ee812f
commit 29af48840f
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/ChangeLog
View File

@ -1,3 +1,8 @@
2011-07-09 Ben Kibbey <bjk@luxsci.net>
* call-scd.c (agent_card_scd): Send the CANCEL command back to SCD
when the SCD command is cancelled from the client.
2011-07-22 Werner Koch <wk@g10code.com>
* command-ssh.c (ssh_receive_key): Do not init comment to an empty

13
agent/call-scd.c
View File

@ -1175,6 +1175,19 @@ agent_card_scd (ctrl_t ctrl, const char *cmdline,
pass_data_thru, assuan_context,
inq_needpin, &inqparm,
pass_status_thru, assuan_context);
if (gpg_err_code(rc) == GPG_ERR_ASS_CANCELED)
{
rc = assuan_write_line(ctrl->scd_local->ctx, "CAN");
if (!rc) {
char *line;
size_t len;
rc = assuan_read_line(ctrl->scd_local->ctx, &line, &len);
if (!rc)
rc = gpg_error(GPG_ERR_ASS_CANCELED);
}
}
assuan_set_flag (ctrl->scd_local->ctx, ASSUAN_CONVEY_COMMENTS, saveflag);
if (rc)
{