Commit d7d218ef authored by Alon Levy's avatar Alon Levy
Browse files

dev-smartcard-reader: change default protocol to T=0 



We don't support T=1 so we shouldn't advertise it by default.

Two independent changes:
* Default ATR
 sets T=0. This gets overwritten by the client provided ATR later.
* Class descriptor
 changes dwAdvertise dwProtocols.PPPP to 0x1 and dwProtocols.RRRR=0 per spec.

Signed-off-by: default avatarAlon Levy <alevy@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <mlureau@redhat.com>
parent 4942d6c3

hw/usb/dev-smartcard-reader.c

+3 −3
Original line number Diff line number Diff line
@@ -335,8 +335,8 @@ static const uint8_t qemu_ccid_descriptor[] = { 
                     */

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



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

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

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

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

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

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

                    /* u32 dwMaximumClock; */
@@ -875,7 +875,7 @@ static const CCID_ProtocolDataStructure defaultProtocolDataStructure = { 


static void ccid_reset_parameters(USBCCIDState *s)

{

   s->bProtocolNum = 1; /* T=1 */

   s->bProtocolNum = 0; /* T=0 */

   s->abProtocolDataStructure = defaultProtocolDataStructure;

}