diff options
| author | NIIBE Yutaka <[email protected]> | 2017-01-30 00:30:32 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-01-30 00:32:03 +0000 |
| commit | 2a025039c1817c7f75c35a898884849a8e5dc926 (patch) | |
| tree | 9523df877f0c3edbc386f03b831906d869939d18 /scd/ccid-driver.h | |
| parent | scd: Don't send GET_STATUS packet if not needed. (diff) | |
| download | gnupg-2a025039c1817c7f75c35a898884849a8e5dc926.tar.gz gnupg-2a025039c1817c7f75c35a898884849a8e5dc926.zip | |
scd: Fix GetSlotStatus.
* scd/apdu.c (get_status_reader): Add ON_WIRE arg, here.
(ct_get_status, pcsc_get_status_direct, pcsc_get_status_wrapped)
(pcsc_get_status, get_status_ccid, my_rapdu_get_status): Likewise.
(reset_pcsc_reader_wrapped, open_pcsc_reader_wrapped): Follow the
change.
(apdu_get_status_internal): It's lower-level driver which judge
it's not needed. Otherwise, it can't detect the removal.
* scd/ccid-driver.c (ccid_slot_status): After the POWERED_OFF check,
we can skip sending GetSlotStatus packet on wire, when no need.
Signed-off-by: NIIBE Yutaka <[email protected]>
Fixes-commit: c8eee4d396a751d41fd1ee1e1b87b851fca172a
Diffstat (limited to 'scd/ccid-driver.h')
| -rw-r--r-- | scd/ccid-driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scd/ccid-driver.h b/scd/ccid-driver.h index cff3f198f..b6da30c07 100644 --- a/scd/ccid-driver.h +++ b/scd/ccid-driver.h @@ -128,7 +128,7 @@ int ccid_shutdown_reader (ccid_driver_t handle); int ccid_close_reader (ccid_driver_t handle); int ccid_get_atr (ccid_driver_t handle, unsigned char *atr, size_t maxatrlen, size_t *atrlen); -int ccid_slot_status (ccid_driver_t handle, int *statusbits); +int ccid_slot_status (ccid_driver_t handle, int *statusbits, int on_wire); int ccid_transceive (ccid_driver_t handle, const unsigned char *apdu, size_t apdulen, unsigned char *resp, size_t maxresplen, size_t *nresp); |