security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-22 14:57:02 +01:00
Code Activity

scd: pinpad fix for PC/SC on Windows.

Browse Source 
* scd/apdu.c (SCARD_CTL_CODE): Fix for Windows.

--

cherry picked from master.
This commit is contained in:
NIIBE Yutaka 2013-10-29 09:07:05 +09:00
parent 2b92007aba
commit 04e5feea8b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scd/apdu.c
View File

@ -227,7 +227,13 @@ static char (* DLSTDCALL CT_close) (unsigned short ctn);
/* Fix pcsc-lite ABI incompatibilty. */
#ifndef SCARD_CTL_CODE
# define SCARD_CTL_CODE(code) (0x42000000 + (code))
#ifdef _WIN32
#include <winioctl.h>
#define SCARD_CTL_CODE(code) CTL_CODE(FILE_DEVICE_SMARTCARD, (code), \
METHOD_BUFFERED, FILE_ANY_ACCESS)
#else
#define SCARD_CTL_CODE(code) (0x42000000 + (code))
#endif
#endif
#define CM_IOCTL_GET_FEATURE_REQUEST SCARD_CTL_CODE(3400)
@ -330,6 +336,7 @@ long (* DLSTDCALL pcsc_control) (long card,
/* Prototypes. */
static int pcsc_vendor_specific_init (int slot);
static int pcsc_get_status (int slot, unsigned int *status);
static int reset_pcsc_reader (int slot);
static int apdu_get_status_internal (int slot, int hang, int no_atr_reset,