VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

removed PCSC_TLV_STRUCTURE since its the attributes are not always packed

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@257 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-08-31 10:26:53 +00:00
parent cfa79d93b0
commit 6a78233be7
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ccid/src/ccid-test.c
View File

@@ -21,7 +21,10 @@
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <winscard.h> #include <winscard.h>
#ifdef HAVE_ARPA_INIT_H
#include <arpa/inet.h> #include <arpa/inet.h>
#endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@@ -33,13 +36,6 @@
#ifdef HAVE_READER_H #ifdef HAVE_READER_H
#include <reader.h> #include <reader.h>
#else
typedef struct
{
uint8_t tag;
uint8_t length;
uint32_t value;
} PCSC_TLV_STRUCTURE;
#endif #endif
@@ -51,6 +47,8 @@ typedef struct
#define CM_IOCTL_GET_FEATURE_REQUEST SCARD_CTL_CODE(3400) #define CM_IOCTL_GET_FEATURE_REQUEST SCARD_CTL_CODE(3400)
#endif #endif
#define PCSC_TLV_ELEMENT_SIZE 6
static void static void
printb(const char *label, unsigned char *buf, size_t len) printb(const char *label, unsigned char *buf, size_t len)
@@ -69,7 +67,7 @@ printb(const char *label, unsigned char *buf, size_t len)
} }
static LONG parse_EstablishPACEChannel_OutputData( static LONG parse_EstablishPACEChannel_OutputData(
unsigned char output[], unsigned int output_length) unsigned char output[], unsigned int output_length)
{ {
uint8_t lengthCAR, lengthCARprev; uint8_t lengthCAR, lengthCARprev;
uint16_t lengthEF_CardAccess, length_IDicc; uint16_t lengthEF_CardAccess, length_IDicc;
@@ -187,7 +185,6 @@ main(int argc, char *argv[])
}; };
BYTE pbRecvBuffer[1024]; BYTE pbRecvBuffer[1024];
DWORD dwActiveProtocol, dwRecvLength, dwReaders, i; DWORD dwActiveProtocol, dwRecvLength, dwReaders, i;
PCSC_TLV_STRUCTURE *pcsc_tlv;
uint16_t lengthInputData = sizeof(pbSendBufferEstablish) - 3; uint16_t lengthInputData = sizeof(pbSendBufferEstablish) - 3;
memcpy(pbSendBufferEstablish + 1, &lengthInputData, 2); memcpy(pbSendBufferEstablish + 1, &lengthInputData, 2);
@@ -245,14 +242,11 @@ main(int argc, char *argv[])
fprintf(stderr, "Could not get the reader's features\n"); fprintf(stderr, "Could not get the reader's features\n");
goto err; goto err;
} }
printb("reader's features\n", pbRecvBuffer, dwRecvLength);
/* get the number of elements instead of the complete size */ for (i = 0; i <= dwRecvLength-PCSC_TLV_ELEMENT_SIZE; i += PCSC_TLV_ELEMENT_SIZE) {
dwRecvLength /= sizeof(PCSC_TLV_STRUCTURE); if (pbRecvBuffer[i] == FEATURE_EXECUTE_PACE) {
memcpy(&pace_ioctl, pbRecvBuffer+i+2, 4);
pcsc_tlv = (PCSC_TLV_STRUCTURE *)pbRecvBuffer;
for (i = 0; i < dwRecvLength; i++) {
if (pcsc_tlv[i].tag == FEATURE_EXECUTE_PACE) {
pace_ioctl = pcsc_tlv[i].value;
break; break;
} }
} }
@@ -284,6 +278,7 @@ main(int argc, char *argv[])
} }
printf("EstablishPACEChannel successfull, received %d bytes\n", printf("EstablishPACEChannel successfull, received %d bytes\n",
dwRecvLength); dwRecvLength);
printb("EstablishPACEChannel\n", pbRecvBuffer, dwRecvLength);
rv = parse_EstablishPACEChannel_OutputData(pbRecvBuffer, dwRecvLength); rv = parse_EstablishPACEChannel_OutputData(pbRecvBuffer, dwRecvLength);
if (rv != SCARD_S_SUCCESS) if (rv != SCARD_S_SUCCESS)