Diffusion GnuPG 005e951714ff

agent: Fix cancellation handling for scdaemon.

Authored by gniibe on Sep 20 2017, 3:42 AM.

Description

agent: Fix cancellation handling for scdaemon.

* agent/call-scd.c (cancel_inquire): Remove.
(agent_card_pksign, agent_card_pkdecrypt, agent_card_writekey)
(agent_card_scd): Don't call cancel_inquire.

Cherry-picked master commit of:
9f5e50e7c85aa8b847d38010241ed570ac114fc3

Since libassuan 2.1.0, cancellation command "CAN" is handled within
the library, by assuan_transact. So, cancel_inquire just caused
spurious "CAN" command to scdaemon which resulted an error.

  • Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

Details

Committed
gniibeFeb 19 2019, 7:52 AM
Parents
rG90e5f49b6a2e: scd: Distinguish cancel by user and protocol error.
Branches
Unknown
Tags
Unknown