security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

scd: add pinpad readers information for PC/SC service.

Browse Source 
* scd/apdu.c (pcsc_vendor_specific_init): Add information for Cherry
ST-2xxx, Reiner cyberJack, Vasco DIGIPASS, FSIJ Gnuk Token, and KAAN
Advance.

--

Cherry pick from master.
This commit is contained in:
NIIBE Yutaka 2013-10-16 09:52:18 +09:00
parent b624677f73
commit 9625e7c75a
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scd/apdu.c
View File

@ -1762,20 +1762,29 @@ pcsc_vendor_specific_init (int slot)
} }
} }
if (get_tlv_ioctl == (pcsc_dword_t)-1)
{
/* /*
* For system which doesn't support GET_TLV_PROPERTIES, * For system which doesn't support GET_TLV_PROPERTIES,
* we put some heuristics here. * we put some heuristics here.
*/ */
if (reader_table[slot].rdrname if (reader_table[slot].rdrname)
&& strstr (reader_table[slot].rdrname, "SPRx32")) {
if (strstr (reader_table[slot].rdrname, "SPRx32"))
{ {
reader_table[slot].is_spr532 = 1; reader_table[slot].is_spr532 = 1;
reader_table[slot].pinpad_varlen_supported = 1; reader_table[slot].pinpad_varlen_supported = 1;
return 0; }
else if (strstr (reader_table[slot].rdrname, "ST-2xxx")
|| strstr (reader_table[slot].rdrname, "cyberJack")
|| strstr (reader_table[slot].rdrname, "DIGIPASS")
|| strstr (reader_table[slot].rdrname, "Gnuk")
|| strstr (reader_table[slot].rdrname, "KAAN"))
reader_table[slot].pinpad_varlen_supported = 1;
} }
if (get_tlv_ioctl == (pcsc_dword_t)-1)
return 0; return 0;
}
len = sizeof (buf); len = sizeof (buf);
sw = control_pcsc (slot, get_tlv_ioctl, NULL, 0, buf, &len); sw = control_pcsc (slot, get_tlv_ioctl, NULL, 0, buf, &len);
@ -1832,6 +1841,12 @@ pcsc_vendor_specific_init (int slot)
reader_table[slot].is_spr532 = 1; reader_table[slot].is_spr532 = 1;
reader_table[slot].pinpad_varlen_supported = 1; reader_table[slot].pinpad_varlen_supported = 1;
} }
else if (vendor == 0x046a && product == 0x003e /* Cherry ST-2xxx */
|| vendor == 0x0c4b /* Tested with Reiner cyberJack GO */
|| vendor == 0x1a44 /* Tested with Vasco DIGIPASS 920 */
|| vendor == 0x234b /* Tested with FSIJ Gnuk Token */
|| vendor == 0x0d46 /* Tested with KAAN Advanced??? */)
reader_table[slot].pinpad_varlen_supported = 1;
return 0; return 0;
} }