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

scd:ccid:spr532: Extend abort_cmd for initialization time.

Browse Source 
* scd/ccid-driver.c (abort_cmd): Add INIT argument to support
synchronize until success, even ignoring timeout.
(bulk_in): Normal use case of abort_cmd.
(ccid_vendor_specific_init): Initial use case of abort_cmd.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-12-09 12:54:43 +09:00
parent f503730272
commit a9aa30ed2c
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scd/ccid-driver.c
View File

@ -266,7 +266,7 @@ static int bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen,
static int bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length, static int bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
size_t *nread, int expected_type, int seqno, int timeout, size_t *nread, int expected_type, int seqno, int timeout,
int no_debug); int no_debug);
static int abort_cmd (ccid_driver_t handle, int seqno); static int abort_cmd (ccid_driver_t handle, int seqno, int init);
static int send_escape_cmd (ccid_driver_t handle, const unsigned char *data, static int send_escape_cmd (ccid_driver_t handle, const unsigned char *data,
size_t datalen, unsigned char *result, size_t datalen, unsigned char *result,
size_t resultmax, size_t *resultlen); size_t resultmax, size_t *resultlen);
@ -1276,7 +1276,7 @@ ccid_vendor_specific_init (ccid_driver_t handle)
* It seems that SEQ may be out of sync between host and the card reader, * It seems that SEQ may be out of sync between host and the card reader,
* and SET_INTERFACE doesn't reset it. Make sure it works at the init. * and SET_INTERFACE doesn't reset it. Make sure it works at the init.
*/ */
abort_cmd (handle, 0); abort_cmd (handle, 0, 1);
} }
if (r != 0 && r != CCID_DRIVER_ERR_CARD_INACTIVE if (r != 0 && r != CCID_DRIVER_ERR_CARD_INACTIVE
@ -1880,6 +1880,8 @@ do_close_reader (ccid_driver_t handle)
libusb_free_transfer (handle->transfer); libusb_free_transfer (handle->transfer);
handle->transfer = NULL; handle->transfer = NULL;
} }
DEBUGOUT ("libusb_release_interface and libusb_close\n");
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;
libusb_close (handle->idev); libusb_close (handle->idev);
@ -2073,7 +2075,7 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
if (msglen < 10) if (msglen < 10)
{ {
DEBUGOUT_1 ("bulk-in msg too short (%u)\n", (unsigned int)msglen); DEBUGOUT_1 ("bulk-in msg too short (%u)\n", (unsigned int)msglen);
abort_cmd (handle, seqno); abort_cmd (handle, seqno, 0);
return CCID_DRIVER_ERR_INV_VALUE; return CCID_DRIVER_ERR_INV_VALUE;
} }
if (buffer[5] != 0) if (buffer[5] != 0)
@ -2119,7 +2121,7 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
if (buffer[0] != expected_type && buffer[0] != RDR_to_PC_SlotStatus) if (buffer[0] != expected_type && buffer[0] != RDR_to_PC_SlotStatus)
{ {
DEBUGOUT_1 ("unexpected bulk-in msg type (%02x)\n", buffer[0]); DEBUGOUT_1 ("unexpected bulk-in msg type (%02x)\n", buffer[0]);
abort_cmd (handle, seqno); abort_cmd (handle, seqno, 0);
return CCID_DRIVER_ERR_INV_VALUE; return CCID_DRIVER_ERR_INV_VALUE;
} }
@ -2194,7 +2196,7 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
/* Send an abort sequence and wait until everything settled. */ /* Send an abort sequence and wait until everything settled. */
static int static int
abort_cmd (ccid_driver_t handle, int seqno) abort_cmd (ccid_driver_t handle, int seqno, int init)
{ {
int rc; int rc;
unsigned char dummybuf[8]; unsigned char dummybuf[8];
@ -2223,7 +2225,8 @@ abort_cmd (ccid_driver_t handle, int seqno)
if (rc) if (rc)
{ {
DEBUGOUT_1 ("usb_control_msg error: %s\n", libusb_error_name (rc)); DEBUGOUT_1 ("usb_control_msg error: %s\n", libusb_error_name (rc));
return map_libusb_error (rc); if (!init)
return map_libusb_error (rc);
} }
/* Now send the abort command to the bulk out pipe using the same /* Now send the abort command to the bulk out pipe using the same
@ -2249,7 +2252,7 @@ abort_cmd (ccid_driver_t handle, int seqno)
#endif #endif
rc = libusb_bulk_transfer (handle->idev, handle->ep_bulk_out, rc = libusb_bulk_transfer (handle->idev, handle->ep_bulk_out,
msg, msglen, &transferred, msg, msglen, &transferred,
5000 /* ms timeout */); init? 100: 5000 /* ms timeout */);
#ifdef USE_NPTH #ifdef USE_NPTH
npth_protect (); npth_protect ();
#endif #endif
@ -2267,7 +2270,7 @@ abort_cmd (ccid_driver_t handle, int seqno)
#endif #endif
rc = libusb_bulk_transfer (handle->idev, handle->ep_bulk_in, rc = libusb_bulk_transfer (handle->idev, handle->ep_bulk_in,
msg, sizeof msg, &msglen, msg, sizeof msg, &msglen,
5000 /*ms timeout*/); init? 100: 5000 /*ms timeout*/);
#ifdef USE_NPTH #ifdef USE_NPTH
npth_protect (); npth_protect ();
#endif #endif
@ -2275,7 +2278,10 @@ abort_cmd (ccid_driver_t handle, int seqno)
{ {
DEBUGOUT_1 ("usb_bulk_read error in abort_cmd: %s\n", DEBUGOUT_1 ("usb_bulk_read error in abort_cmd: %s\n",
libusb_error_name (rc)); libusb_error_name (rc));
return map_libusb_error (rc); if (init && rc == LIBUSB_ERROR_TIMEOUT)
continue;
else
return map_libusb_error (rc);
} }
if (msglen < 10) if (msglen < 10)
@ -2295,7 +2301,8 @@ abort_cmd (ccid_driver_t handle, int seqno)
if (CCID_COMMAND_FAILED (msg)) if (CCID_COMMAND_FAILED (msg))
print_command_failed (msg); print_command_failed (msg);
} }
while (msg[0] != RDR_to_PC_SlotStatus && msg[5] != 0 && msg[6] != seqno); while (rc == LIBUSB_ERROR_TIMEOUT
|| (msg[0] != RDR_to_PC_SlotStatus && msg[5] != 0 && msg[6] != seqno));
handle->seqno = ((seqno + 1) & 0xff); handle->seqno = ((seqno + 1) & 0xff);
DEBUGOUT ("sending abort sequence succeeded\n"); DEBUGOUT ("sending abort sequence succeeded\n");
@ -2490,7 +2497,7 @@ ccid_slot_status (ccid_driver_t handle, int *statusbits, int on_wire)
#endif #endif
} }
else else
DEBUGOUT ("USB: RETRYING bulk_in AGAIN\n"); DEBUGOUT ("USB: RETRYING bulk_in AGAIN\n");
retries++; retries++;
goto retry; goto retry;
} }