security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-09 23:39:51 +02:00
Code Activity

scd: Fix INTERRUPT transfer.

Browse Source 
* scd/ccid-driver.c (find_endpoint): Don't return Bulk endpoint as
Interrupt endpoint.
(ccid_poll): Call libusb_interrupt_transfer.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-01-23 16:12:41 +09:00
parent e926f30a1c
commit 21c9ebb908
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scd/ccid-driver.c
View File

@ -1100,8 +1100,9 @@ find_endpoint (const struct libusb_interface_descriptor *ifcdesc, int mode)
== LIBUSB_TRANSFER_TYPE_INTERRUPT) == LIBUSB_TRANSFER_TYPE_INTERRUPT)
&& (ep->bEndpointAddress & 0x80)) && (ep->bEndpointAddress & 0x80))
return ep->bEndpointAddress; return ep->bEndpointAddress;
else if (((ep->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK) else if ((mode == 0 || mode == 1)
== LIBUSB_TRANSFER_TYPE_BULK) && ((ep->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK)
== LIBUSB_TRANSFER_TYPE_BULK)
&& (ep->bEndpointAddress & 0x80) == want_bulk_in) && (ep->bEndpointAddress & 0x80) == want_bulk_in)
return ep->bEndpointAddress; return ep->bEndpointAddress;
} }
@ -2459,9 +2460,9 @@ ccid_poll (ccid_driver_t handle)
if (handle->idev) if (handle->idev)
{ {
rc = libusb_bulk_transfer (handle->idev, handle->ep_intr, rc = libusb_interrupt_transfer (handle->idev, handle->ep_intr,
(char*)msg, sizeof msg, &msglen, (char*)msg, sizeof msg, &msglen,
0 /* ms timeout */ ); 0 /* ms timeout */ );
if (rc == LIBUSB_ERROR_TIMEOUT) if (rc == LIBUSB_ERROR_TIMEOUT)
return 0; return 0;
} }