|
1 Upstream fixes already included in the latest community updates to coolkey v1.1.0 |
|
2 |
|
3 Adds header definitions for SCARD API and ADPU fixes. |
|
4 SCARD_READERSTATE_A to SCARD_READERSTATE for appropriate macro definitons on Solaris. |
|
5 |
|
6 --- ORIGINAL/./src/libckyapplet/cky_card.h 2016-06-27 10:13:43.738293230 -0400 |
|
7 +++ ././src/libckyapplet/cky_card.h 2016-06-28 09:52:07.447312681 -0400 |
|
8 @@ -41,23 +41,23 @@ |
|
9 CKYLIST_DECLARE(CKYCardConnection, CKYCardConnection *) |
|
10 |
|
11 CKY_BEGIN_PROTOS |
|
12 -void CKYReader_Init(SCARD_READERSTATE_A *reader); |
|
13 -void CKYReader_FreeData(SCARD_READERSTATE_A *reader); |
|
14 +void CKYReader_Init(SCARD_READERSTATE *reader); |
|
15 +void CKYReader_FreeData(SCARD_READERSTATE *reader); |
|
16 |
|
17 /* |
|
18 - * "Accessors": for SCARD_READERSTATE_A structure as a class. |
|
19 - * These functions take an SCARD_READERSTATE_A which can also be referenced |
|
20 + * "Accessors": for SCARD_READERSTATE structure as a class. |
|
21 + * These functions take an SCARD_READERSTATE which can also be referenced |
|
22 * directly. |
|
23 */ |
|
24 -CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE_A *reader, const char *name); |
|
25 -const char *CKYReader_GetReaderName(const SCARD_READERSTATE_A *reader); |
|
26 -CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE_A *reader, |
|
27 +CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE *reader, const char *name); |
|
28 +const char *CKYReader_GetReaderName(const SCARD_READERSTATE *reader); |
|
29 +CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE *reader, |
|
30 unsigned long state); |
|
31 -unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE_A *reader); |
|
32 -unsigned long CKYReader_GetEventState(const SCARD_READERSTATE_A *reader); |
|
33 -CKYStatus CKYReader_GetATR(const SCARD_READERSTATE_A *reader, CKYBuffer *buf); |
|
34 +unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE *reader); |
|
35 +unsigned long CKYReader_GetEventState(const SCARD_READERSTATE *reader); |
|
36 +CKYStatus CKYReader_GetATR(const SCARD_READERSTATE *reader, CKYBuffer *buf); |
|
37 /* create an array of READERSTATEs from a LIST of Readers */ |
|
38 -SCARD_READERSTATE_A *CKYReader_CreateArray(const CKYReaderNameList readerNames, |
|
39 +SCARD_READERSTATE *CKYReader_CreateArray(const CKYReaderNameList readerNames, |
|
40 unsigned long *readerCount); |
|
41 /* frees the reader, then the full array */ |
|
42 void CKYReader_DestroyArray(SCARD_READERSTATE *reader, unsigned long count); |
|
43 @@ -88,7 +88,7 @@ |
|
44 const CKYBuffer *targetATR); |
|
45 /* return if any of the readers in our array has changed in status */ |
|
46 CKYStatus CKYCardContext_WaitForStatusChange(CKYCardContext *context, |
|
47 - SCARD_READERSTATE_A *readers, |
|
48 + SCARD_READERSTATE *readers, |
|
49 unsigned long readerCount, |
|
50 unsigned long timeout); |
|
51 /* cancel any current operation (such as wait for status change) on this |