|
 |
ed074c |
diff -up ./src/coolkey/slot.cpp.reader-state-fix ./src/coolkey/slot.cpp
|
|
|
ed074c |
--- ./src/coolkey/slot.cpp.reader-state-fix 2010-09-08 13:25:14.479109000 -0700
|
|
|
ed074c |
+++ ./src/coolkey/slot.cpp 2010-09-08 13:25:14.506109000 -0700
|
|
|
ed074c |
@@ -2185,6 +2185,7 @@ Slot::readCACCertificateFirst(CKYBuffer
|
|
|
ed074c |
{
|
|
|
ed074c |
CKYStatus status;
|
|
|
ed074c |
CKYISOStatus apduRC;
|
|
|
ed074c |
+ *nextSize = 0;
|
|
|
ed074c |
|
|
|
ed074c |
if (mOldCAC) {
|
|
|
ed074c |
/* get the first 100 bytes of the cert */
|
|
|
ed074c |
diff -up ./src/libckyapplet/cky_card.c.reader-state-fix ./src/libckyapplet/cky_card.c
|
|
|
ed074c |
--- ./src/libckyapplet/cky_card.c.reader-state-fix 2010-09-08 14:05:10.859321000 -0700
|
|
|
ed074c |
+++ ./src/libckyapplet/cky_card.c 2010-09-08 14:05:42.792257000 -0700
|
|
|
ed074c |
@@ -27,7 +27,6 @@
|
|
|
ed074c |
|
|
|
ed074c |
#ifndef WINAPI
|
|
|
ed074c |
#define WINAPI
|
|
|
ed074c |
-typedef SCARD_READERSTATE *LPSCARD_READERSTATE;
|
|
|
ed074c |
#endif
|
|
|
ed074c |
|
|
|
ed074c |
#ifndef SCARD_E_NO_READERS_AVAILABLE
|
|
|
ed074c |
diff -up ./src/libckyapplet/cky_card.h.reader-state-fix ./src/libckyapplet/cky_card.h
|
|
|
ed074c |
--- ./src/libckyapplet/cky_card.h.reader-state-fix 2006-06-09 11:44:17.000000000 -0700
|
|
|
ed074c |
+++ ./src/libckyapplet/cky_card.h 2010-09-08 13:25:14.518109000 -0700
|
|
|
ed074c |
@@ -41,23 +41,23 @@ CKYLIST_DECLARE(CKYReaderName, char *)
|
|
|
ed074c |
CKYLIST_DECLARE(CKYCardConnection, CKYCardConnection *)
|
|
|
ed074c |
|
|
|
ed074c |
CKY_BEGIN_PROTOS
|
|
|
ed074c |
-void CKYReader_Init(SCARD_READERSTATE_A *reader);
|
|
|
ed074c |
-void CKYReader_FreeData(SCARD_READERSTATE_A *reader);
|
|
|
ed074c |
+void CKYReader_Init(SCARD_READERSTATE *reader);
|
|
|
ed074c |
+void CKYReader_FreeData(SCARD_READERSTATE *reader);
|
|
|
ed074c |
|
|
|
ed074c |
/*
|
|
|
ed074c |
- * "Accessors": for SCARD_READERSTATE_A structure as a class.
|
|
|
ed074c |
- * These functions take an SCARD_READERSTATE_A which can also be referenced
|
|
|
ed074c |
+ * "Accessors": for SCARD_READERSTATE structure as a class.
|
|
|
ed074c |
+ * These functions take an SCARD_READERSTATE which can also be referenced
|
|
|
ed074c |
* directly.
|
|
|
ed074c |
*/
|
|
|
ed074c |
-CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE_A *reader, const char *name);
|
|
|
ed074c |
-const char *CKYReader_GetReaderName(const SCARD_READERSTATE_A *reader);
|
|
|
ed074c |
-CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE_A *reader,
|
|
|
ed074c |
+CKYStatus CKYReader_SetReaderName(SCARD_READERSTATE *reader, const char *name);
|
|
|
ed074c |
+const char *CKYReader_GetReaderName(const SCARD_READERSTATE *reader);
|
|
|
ed074c |
+CKYStatus CKYReader_SetKnownState(SCARD_READERSTATE *reader,
|
|
|
ed074c |
unsigned long state);
|
|
|
ed074c |
-unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE_A *reader);
|
|
|
ed074c |
-unsigned long CKYReader_GetEventState(const SCARD_READERSTATE_A *reader);
|
|
|
ed074c |
-CKYStatus CKYReader_GetATR(const SCARD_READERSTATE_A *reader, CKYBuffer *buf);
|
|
|
ed074c |
+unsigned long CKYReader_GetKnownState(const SCARD_READERSTATE *reader);
|
|
|
ed074c |
+unsigned long CKYReader_GetEventState(const SCARD_READERSTATE *reader);
|
|
|
ed074c |
+CKYStatus CKYReader_GetATR(const SCARD_READERSTATE *reader, CKYBuffer *buf);
|
|
|
ed074c |
/* create an array of READERSTATEs from a LIST of Readers */
|
|
|
ed074c |
-SCARD_READERSTATE_A *CKYReader_CreateArray(const CKYReaderNameList readerNames,
|
|
|
ed074c |
+SCARD_READERSTATE *CKYReader_CreateArray(const CKYReaderNameList readerNames,
|
|
|
ed074c |
unsigned long *readerCount);
|
|
|
ed074c |
/* frees the reader, then the full array */
|
|
|
ed074c |
void CKYReader_DestroyArray(SCARD_READERSTATE *reader, unsigned long count);
|
|
|
ed074c |
@@ -88,7 +88,7 @@ CKYStatus CKYCardContext_FindReadersByAT
|
|
|
ed074c |
const CKYBuffer *targetATR);
|
|
|
ed074c |
/* return if any of the readers in our array has changed in status */
|
|
|
ed074c |
CKYStatus CKYCardContext_WaitForStatusChange(CKYCardContext *context,
|
|
|
ed074c |
- SCARD_READERSTATE_A *readers,
|
|
|
ed074c |
+ SCARD_READERSTATE *readers,
|
|
|
ed074c |
unsigned long readerCount,
|
|
|
ed074c |
unsigned long timeout);
|
|
|
ed074c |
/* cancel any current operation (such as wait for status change) on this
|