security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

scd: Fix for inactive card at start by internal CCID driver.

Browse Source 
* scd/ccid-driver.c (do_close_reader): Set NULL on close.
(bulk_in): Move DEBUGOUT and check by EP_INTR.
(ccid_get_atr): Clear powered_off flag after initial status check.

--

Many card readers automatically turn on inserted card, but some
defaults to turning off at start.

GnuPG-bug-id: 3508
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-12-27 17:20:03 +09:00
parent a684988829
commit 4f88b0f561
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scd/ccid-driver.c
View File

@ -1778,6 +1778,7 @@ do_close_reader (ccid_driver_t handle)
} }
libusb_free_transfer (handle->transfer); libusb_free_transfer (handle->transfer);
handle->transfer = NULL;
} }
libusb_release_interface (handle->idev, handle->ifc_no); libusb_release_interface (handle->idev, handle->ifc_no);
--ccid_usb_thread_is_alive; --ccid_usb_thread_is_alive;
@ -2038,10 +2039,14 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
/* /*
* Communication failure by device side. * Communication failure by device side.
* Possibly, it was forcibly suspended and resumed. * Possibly, it was forcibly suspended and resumed.
*
* Only detect this kind of failure when interrupt transfer is
* not supported. For card reader with interrupt transfer
* support removal is detected by intr_cb.
*/ */
DEBUGOUT ("CCID: card inactive/removed\n"); if (handle->ep_intr < 0)
if (handle->transfer == NULL)
{ {
DEBUGOUT ("CCID: card inactive/removed\n");
handle->powered_off = 1; handle->powered_off = 1;
scd_kick_the_loop (); scd_kick_the_loop ();
} }
@ -2539,6 +2544,14 @@ ccid_get_atr (ccid_driver_t handle,
if (statusbits == 2) if (statusbits == 2)
return CCID_DRIVER_ERR_NO_CARD; return CCID_DRIVER_ERR_NO_CARD;
/*
* In the first invocation of ccid_slot_status, card reader may
* return CCID_DRIVER_ERR_CARD_INACTIVE and handle->powered_off may
* become 1. Because inactive card is no problem (we are turning it
* ON here), clear the flag.
*/
handle->powered_off = 0;
/* For an inactive and also for an active card, issue the PowerOn /* For an inactive and also for an active card, issue the PowerOn
command to get the ATR. */ command to get the ATR. */
again: again: