[Pcsclite-cvs-commit] r6211 - in /trunk/Drivers/ccid/src: ccid.c ccid.h

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jan 31 16:55:29 2012
New Revision: 6211

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6211
Log:
Disable SPE for HP USB CCID Smartcard Keyboard

The Secure Pin Entry of the HP USB CCID Smartcard Keyboard idVendor:
0x03F0 idProduct: 0x0036 is bogus and can't be used on Unix.

00000033 Control TxBuffer: 1E 1E 02 00 00 10 04 02 00 00 00 00 00 00 00 05 00 00 00 00 20 00 81 00
00000013 openct/proto-t1.c:571:t1_build() more bit: 0
00000039 -> 000000 69 14 00 00 00 00 24 00 00 00 00 1E 02 00 00 10 04 02 00 00 00 00 00 40 05 00 20 00 81 00
30005454 <- 000000 80 00 00 00 00 00 24 40 F0 00
00000059 commands.c:1339:CCID_Receive PIN timeout

Instead of telling the reader has SPE and failing with an obscure error
the driver will disable the SPE feature.

Thanks to Jörg Grundmann for the bug report.

Modified:
    trunk/Drivers/ccid/src/ccid.c
    trunk/Drivers/ccid/src/ccid.h

Modified: trunk/Drivers/ccid/src/ccid.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid.c?rev=6211&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid.c (original)
+++ trunk/Drivers/ccid/src/ccid.c Tue Jan 31 16:55:29 2012
@@ -328,6 +328,7 @@
 			break;
 
 		case HPSMARTCARDKEYBOARD:
+		case HP_CCIDSMARTCARDKEYBOARD:
 			/* the Secure Pin Entry is bogus so disable it
 			 * http://martinpaljak.net/2011/03/19/insecure-hp-usb-smart-card-keyboard/
 			 */

Modified: trunk/Drivers/ccid/src/ccid.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid.h?rev=6211&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid.h (original)
+++ trunk/Drivers/ccid/src/ccid.h Tue Jan 31 16:55:29 2012
@@ -201,6 +201,7 @@
 #define KOBIL_MIDENTITY_VISUAL	0x0D460D46
 #define VEGAALPHA   0x09820008
 #define HPSMARTCARDKEYBOARD 0x03F01024
+#define HP_CCIDSMARTCARDKEYBOARD 0x03F00036
 
 #define VENDOR_GEMALTO 0x08E6
 #define GET_VENDOR(readerID) ((readerID >> 16) & 0xFFFF)