security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

scd: Use vendor and product id macros also in apdu.c

Browse source 
* scd/ccid-driver.c: Move vendor and product ids to ...
* scd/ccid-driver.h: here.
* scd/apdu.c (CCID_DRIVER_INCLUDE_USB_IDS): Define to include ids.
(pcsc_vendor_specific_init): Use vendor and product id macros.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2013-08-30 09:28:17 +02:00
parent 95a3bffeaf
commit fc31d730d8
3 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scd/apdu.c
View file

@ -62,6 +62,7 @@
#include "iso7816.h"
#include "apdu.h"
#define CCID_DRIVER_INCLUDE_USB_IDS 1
#include "ccid-driver.h"
/* Due to conflicting use of threading libraries we usually can't link
@ -1797,7 +1798,7 @@ pcsc_vendor_specific_init (int slot)
p += l;
}
if (vendor == 0x0982 && product == 0x0008) /* Vega Alpha */
if (vendor == VENDOR_VEGA && product == VEGA_ALPHA)
{
/*
* Please read the comment of ccid_vendor_specific_init in
@ -1809,7 +1810,7 @@ pcsc_vendor_specific_init (int slot)
if (sw)
return SW_NOT_SUPPORTED;
}
else if (vendor == 0x04e6 && product == 0xe003) /* SCM SPR532 */
else if (vendor == VENDOR_SCM && product == SCM_SPR532) /* SCM SPR532 */
{
reader_table[slot].is_spr532 = 1;
reader_table[slot].pinpad_varlen_supported = 1;