From e541592f0c98696276261a7c36afe074a3bdd956 Mon Sep 17 00:00:00 2001

From: Maxim Levitsky <mlevitsk@redhat.com>

Date: Wed, 18 Sep 2019 18:45:52 +0100

Subject: [PATCH 11/22] ccid: Fix dwProtocols advertisement of T=0

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Maxim Levitsky <mlevitsk@redhat.com>

Message-id: <20190918184552.10820-2-mlevitsk@redhat.com>

Patchwork-id: 90769

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 1/1] ccid: Fix dwProtocols advertisement of T=0

Bugzilla: 1746361

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>

RH-Acked-by: John Snow <jsnow@redhat.com>

From: Jason Andryuk <jandryuk@gmail.com>

Commit d7d218ef02d87c637d20d64da8f575d434ff6f78 attempted to change

dwProtocols to only advertise support for T=0 and not T=1.  The change

was incorrect as it changed 0x00000003 to 0x00010000.

lsusb -v in a linux guest shows:

"dwProtocols         65536  (Invalid values detected)", though the

smart card could still be accessed.  Windows 7 does not detect inserted

smart cards and logs the the following Error in the Event Logs:

    Source: Smart Card Service

    Event ID: 610

    Smart Card Reader 'QEMU QEMU USB CCID 0' rejected IOCTL SET_PROTOCOL:

    Incorrect function. If this error persists, your smart card or reader

    may not be functioning correctly

    Command Header: 03 00 00 00

Setting to 0x00000001 fixes the Windows issue.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>

Message-id: 20180420183219.20722-1-jandryuk@gmail.com

Cc: qemu-stable@nongnu.org

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

(cherry picked from commit 0ee86bb6c5beb6498488850104f7557c376d0bef)

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/usb/dev-smartcard-reader.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c

index e646805..cabb564 100644

--- a/hw/usb/dev-smartcard-reader.c

+++ b/hw/usb/dev-smartcard-reader.c

@@ -329,8 +329,8 @@ static const uint8_t qemu_ccid_descriptor[] = {

                      */

         0x07,       /* u8  bVoltageSupport; 01h - 5.0v, 02h - 3.0, 03 - 1.8 */

-        0x00, 0x00, /* u32 dwProtocols; RRRR PPPP. RRRR = 0000h.*/

-        0x01, 0x00, /* PPPP: 0001h = Protocol T=0, 0002h = Protocol T=1 */

+        0x01, 0x00, /* u32 dwProtocols; RRRR PPPP. RRRR = 0000h.*/

+        0x00, 0x00, /* PPPP: 0001h = Protocol T=0, 0002h = Protocol T=1 */

                     /* u32 dwDefaultClock; in kHZ (0x0fa0 is 4 MHz) */

         0xa0, 0x0f, 0x00, 0x00,

                     /* u32 dwMaximumClock; */

-- 

1.8.3.1