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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Mar 24 14:33:03 2009
New Revision: 3375

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3375
Log:
SecurePINVerify(): Correct bNumberMessage for Dell keyboard

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

Modified: trunk/Drivers/ccid/src/ccid.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid.h?rev=3375&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid.h (original)
+++ trunk/Drivers/ccid/src/ccid.h Tue Mar 24 14:33:03 2009
@@ -168,6 +168,7 @@
 #define REINER_SCT	0x0C4B0300 
 #define SEG			0x08E68000
 #define BLUDRIVEII_CCID	0x1B0E1078
+#define DELLSCRK    0x413C2101
 
 /*
  * The O2Micro OZ776S reader has a wrong USB descriptor

Modified: trunk/Drivers/ccid/src/commands.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/commands.c?rev=3375&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/commands.c (original)
+++ trunk/Drivers/ccid/src/commands.c Tue Mar 24 14:33:03 2009
@@ -322,6 +322,18 @@
 			TxBuffer[7] = 0x02;	/* validation key pressed */
 		}
 
+	}
+
+	if (DELLSCRK == ccid_descriptor->readerID)
+	{
+		/* the firmware rejects the cases: 01h-FEh and FFh default
+		 * CCID message. The only value supported is 00h (no message) */
+		if (0x00 != TxBuffer[8])
+		{
+			DEBUG_INFO2("Correct bNumberMessage for Dell keyboard (was %d)",
+				TxBuffer[8]);
+			TxBuffer[8] = 0x00;
+		}
 	}
 #endif