freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with latest pcsc-lite.

Browse Source
This commit is contained in:
Alex Dupre
2010-09-01 11:08:36 +00:00
parent 8ead05e378
commit 6e8b1f4e23
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
security/opensc/files/patch-src_libopensc_internal-winscard.h Normal file
View File

@@ -0,0 +1,11 @@
--- src/libopensc/internal-winscard.h.orig 2010-09-01 11:37:56.000000000 +0200
+++ src/libopensc/internal-winscard.h 2010-09-01 11:38:31.000000000 +0200
@@ -113,7 +113,7 @@
typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen,
LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen);
typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout,
- LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders);
+ LPSCARD_READERSTATE rgReaderStates, DWORD cReaders);
typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength,
LPVOID pbRecvBuffer, LPDWORD lpBytesReturned);
typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer,

29
security/opensc/files/patch-src_libopensc_reader-pcsc.c Normal file
View File

@@ -0,0 +1,29 @@
--- src/libopensc/reader-pcsc.c.orig 2010-09-01 12:44:28.000000000 +0200
+++ src/libopensc/reader-pcsc.c 2010-09-01 12:44:52.000000000 +0200
@@ -80,7 +80,7 @@
struct pcsc_slot_data {
SCARDHANDLE pcsc_card;
- SCARD_READERSTATE_A reader_state;
+ SCARD_READERSTATE reader_state;
DWORD verify_ioctl;
DWORD verify_ioctl_start;
DWORD verify_ioctl_finish;
@@ -353,7 +353,7 @@
sc_context_t *ctx;
SCARDCONTEXT pcsc_ctx;
LONG ret;
- SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS];
+ SCARD_READERSTATE rgReaderStates[SC_MAX_READERS];
unsigned long on_bits, off_bits;
time_t end_time, now, delta;
size_t i;
@@ -401,7 +401,7 @@
/* Wait for a status change and return if it's a card insert/removal
*/
for( ; ; ) {
- SCARD_READERSTATE_A *rsp;
+ SCARD_READERSTATE *rsp;
/* Scan the current state of all readers to see if they
* match any of the events we're polling for */