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

- lnfc: capdu was not copied, fixed

Browse Source 
- changed some output messages


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@354 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-11-10 20:44:34 +00:00
parent 44dc9f6c7d
commit a012c02caf
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pcsc-relay/src/lnfc.c
View File

@@ -124,21 +124,21 @@ static int lnfc_connect(void **driver_data)
*driver_data = data;
// Try to open the NFC emulator device
data->pndTarget = nfc_connect (NULL);
if (data->pndTarget == NULL) {
ERROR("Error connecting NFC emulator device\n");
ERROR("Error connecting to NFC emulator device\n");
return 0;
}
INFO("Connected to the NFC emulator device: %s\n", data->pndTarget->acName);
if (verbose >= 0)
printf("Connected to %s\n", data->pndTarget->acName);
if (!nfc_target_init (data->pndTarget, &ntEmulatedTarget, data->abtCapdu, &data->szCapduLen)) {
ERROR("Initialization of NFC emulator failed");
nfc_disconnect (data->pndTarget);
return 0;
}
DEBUG("%s\n", "Done, relaying frames now!");
DEBUG("Initialized NFC emulator\n");
return 1;
@@ -159,6 +159,7 @@ static int lnfc_receive_capdu(void *driver_data,
unsigned char **capdu, size_t *len)
{
struct lnfc_data *data = driver_data;
unsigned char *p;
if (!data || !capdu || !len)
return 0;
@@ -172,6 +173,16 @@ static int lnfc_receive_capdu(void *driver_data,
}
p = realloc(*capdu, data->szCapduLen);
if (!p) {
ERROR("Error allocating memory for C-APDU\n");
return 0;
}
memcpy(p, data->abtCapdu, data->szCapduLen);
*capdu = p;
*len = data->szCapduLen;
return 1;
}