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

pcsc-relay: allow no-ops when sending/receiving

Browse Source
This commit is contained in:
Frank Morgner
2024-02-27 10:57:12 +01:00
parent 1a395716cb
commit 780cc7c4fa
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,13 +207,15 @@ static int lnfc_receive_capdu(driver_data_t *driver_data,
} }
p = realloc(*capdu, data->iCapduLen); if (data->iCapduLen) {
if (!p) { p = realloc(*capdu, data->iCapduLen);
RELAY_ERROR("Error allocating memory for C-APDU\n"); if (!p) {
return 0; RELAY_ERROR("Error allocating memory for C-APDU (%d bytes)\n", data->iCapduLen);
return 0;
}
memcpy(p, data->abtCapdu, data->iCapduLen);
*capdu = p;
} }
memcpy(p, data->abtCapdu, data->iCapduLen);
*capdu = p;
*len = data->iCapduLen; *len = data->iCapduLen;
@@ -230,13 +232,15 @@ static int lnfc_send_rapdu(driver_data_t *driver_data,
return 0; return 0;
r = nfc_target_send_bytes(data->pndTarget, rapdu, len, -1); if (len) {
if (r < 0) { r = nfc_target_send_bytes(data->pndTarget, rapdu, len, -1);
RELAY_ERROR ("nfc_target_send_bytes: %s\n", nfc_strerror(data->pndTarget)); if (r < 0) {
return 0; RELAY_ERROR ("nfc_target_send_bytes: %s\n", nfc_strerror(data->pndTarget));
return 0;
}
if (r < len)
INFO ("Transmitted %u less bytes than desired: %s\n", (unsigned int) len-r, nfc_strerror(data->pndTarget));
} }
if (r < len)
INFO ("Transmitted %u less bytes than desired: %s\n", (unsigned int) len-r, nfc_strerror(data->pndTarget));
return 1; return 1;

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

@@ -208,15 +208,13 @@ static int picc_receive_capdu(driver_data_t *driver_data,
/* read C-APDU */ /* read C-APDU */
linelen = getline(&data->line, &data->linemax, data->fd); linelen = getline(&data->line, &data->linemax, data->fd);
if (linelen <= 0) { if (linelen < 0) {
if (linelen < 0) { RELAY_ERROR("Error reading from %s: %s\n", PICCDEV, strerror(errno));
RELAY_ERROR("Error reading from %s: %s\n", PICCDEV, strerror(errno)); return 0;
return 0; }
} if (linelen == 0) {
if (linelen == 0) { *len = 0;
*len = 0; return 1;
return 1;
}
} }
if (fflush(data->fd) != 0) if (fflush(data->fd) != 0)
RELAY_ERROR("Warning, fflush failed: %s\n", strerror(errno)); RELAY_ERROR("Warning, fflush failed: %s\n", strerror(errno));
@@ -237,6 +235,9 @@ static int picc_send_rapdu(driver_data_t *driver_data,
if (!data || !rapdu) if (!data || !rapdu)
return 0; return 0;
if (!len)
return 1;
/* encode R-APDU */ /* encode R-APDU */
if (!picc_encode_rapdu(rapdu, len, &data->e_rapdu, &buflen)) if (!picc_encode_rapdu(rapdu, len, &data->e_rapdu, &buflen))

2
pcsc-relay/src/vicc.c
View File

@@ -136,7 +136,7 @@ static int vicc_receive_capdu(driver_data_t *driver_data,
goto err; goto err;
} }
} else { } else {
// finaly we got the capdu // finally we got the C-APDU
*len = size; *len = size;
r = 1; r = 1;
} }