[Pcsclite-git-commit] [CCID] 03/03: Fix support of HID Aviator generic

[Ludovic Rousseau]

This is an automated email from the git hooks/post-receive script.

rousseau pushed a commit to branch master
in repository CCID.

commit e039760f0ab57a0e66e2f6dabebfdf6ba3134b14
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Mon May 9 10:05:45 2016 +0200

    Fix support of HID Aviator generic
    
    This reader firmware is bogus:
    - it declares pinpad support but as no keyboard
    - it declares short APDU but uses chaining as for extended APDU
    
    Thanks to Martin Paljak for the bug report
    https://github.com/LudovicRousseau/CCID/pull/16
---
 src/ccid.c | 7 +++++++
 src/ccid.h | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/ccid.c b/src/ccid.c
index a004269..77b2dd9 100644
--- a/src/ccid.c
+++ b/src/ccid.c
@@ -467,6 +467,13 @@ int ccid_open_hack_post(unsigned int reader_index)
 			 */
 			ccid_descriptor->bPINSupport = 0;
 			break;
+		case HID_AVIATOR:
+			/* The chip advertises pinpad but actually doesn't have one */
+			ccid_descriptor->bPINSupport = 0;
+			/* Firmware uses chaining */
+			ccid_descriptor->dwFeatures &= ~CCID_CLASS_EXCHANGE_MASK;
+			ccid_descriptor->dwFeatures |= CCID_CLASS_EXTENDED_APDU;
+			break;
 
 #if 0
 		/* SCM SCR331-DI contactless */
diff --git a/src/ccid.h b/src/ccid.h
index 8518df3..57f6ef1 100644
--- a/src/ccid.h
+++ b/src/ccid.h
@@ -211,6 +211,7 @@ typedef struct
 #define CHERRY_KC1000SC 0x046A00A1
 #define ElatecTWN4	0x09D80427
 #define SCM_SCL011 0x04E65293
+#define HID_AVIATOR	0x076B3A21
 
 #define VENDOR_GEMALTO 0x08E6
 #define GET_VENDOR(readerID) ((readerID >> 16) & 0xFFFF)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/CCID.git