scd: Distinguish cancel by user and protocol error.
authorNIIBE Yutaka <gniibe@fsij.org>
Wed, 20 Sep 2017 01:06:43 +0000 (10:06 +0900)
committerPeter Michael Green <plugwash@raspbian.org>
Wed, 25 Jul 2018 10:25:32 +0000 (11:25 +0100)
commit8417e3a7925868ae9898a5f9514dc951a0519a4d
treed2d3f1beae6d19010193f40a8e5d0c3baf2429e6
parent31723b7bffac6ce8a9cf76d7519f1cd02dfd736c
scd: Distinguish cancel by user and protocol error.

* scd/apdu.h (SW_HOST_CANCELLED): New.
* scd/apdu.c (host_sw_string): Support SW_HOST_CANCELLED.
(pcsc_error_to_sw): Return SW_HOST_CANCELLED for PCSC_E_CANCELLED.
* scd/iso7816.c (map_sw): Return GPG_ERR_INV_RESPONSE for
SW_HOST_ABORTED and GPG_ERR_CANCELED for SW_HOST_CANCELLED.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit 2396055c096884d521c26b76f26263a146207c24)

Gbp-Pq: Topic from-master
Gbp-Pq: Name scd-Distinguish-cancel-by-user-and-protocol-error.patch
scd/apdu.c
scd/apdu.h
scd/iso7816.c