diff options
| author | NIIBE Yutaka <[email protected]> | 2020-11-27 06:17:56 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2020-11-27 06:17:56 +0000 |
| commit | bb591222c3c5cb1a1750b1b1dd26d0bc53b347cb (patch) | |
| tree | 016dbb5c3fed3c99e6a3ef361513b1d4e15d45be /scd/iso7816.c | |
| parent | agent: Fix YK s/n and prettify the request card prompt for Yubikeys (diff) | |
| download | gnupg-bb591222c3c5cb1a1750b1b1dd26d0bc53b347cb.tar.gz gnupg-bb591222c3c5cb1a1750b1b1dd26d0bc53b347cb.zip | |
scd:ccid-driver: Fix pinpad error handling for cancel/timeout.
* scd/apdu.h (SW_HOST_UI_CANCELLED, SW_HOST_UI_TIMEOUT): New.
* scd/ccid-driver.h (CCID_DRIVER_ERR_UI_CANCELLED): New.
(CCID_DRIVER_ERR_UI_TIMEOUT): New.
* scd/ccid-driver.c (bulk_in): Handle PIN input cancel/timeout error.
* scd/iso7816.c (map_sw): Support SW_HOST_UI_CANCELLED and
SW_HOST_UI_TIMEOUT.
--
GnuPG-bug-id: 4614
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/iso7816.c')
| -rw-r--r-- | scd/iso7816.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scd/iso7816.c b/scd/iso7816.c index ef02d64cc..f14c14f69 100644 --- a/scd/iso7816.c +++ b/scd/iso7816.c @@ -96,6 +96,8 @@ map_sw (int sw) case SW_HOST_USB_BUSY: ec = GPG_ERR_EBUSY; break; case SW_HOST_USB_TIMEOUT: ec = GPG_ERR_TIMEOUT; break; case SW_HOST_USB_OVERFLOW: ec = GPG_ERR_EOVERFLOW; break; + case SW_HOST_UI_CANCELLED: ec = GPG_ERR_CANCELED; break; + case SW_HOST_UI_TIMEOUT: ec = GPG_ERR_TIMEOUT; break; default: if ((sw & 0x010000)) |