sergey/fido2-manage
1
0
Fork 0
mirror of https://github.com/token2/fido2-manage.git synced 2026-04-09 10:45:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update nfc.c

Browse Source
This commit is contained in:
Token2
2024-12-03 16:27:28 +01:00
committed by GitHub
parent 2c14b222a4
commit 8dc463af0f
1 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/nfc.c
View File

@@ -144,51 +144,12 @@ fail:
} }
static int static int
rx_init(fido_dev_t *d, unsigned char *buf, size_t count, int ms) tx_get_response(fido_dev_t *d, uint8_t count, bool cbor)
{
fido_ctap_info_t *attr = (fido_ctap_info_t *)buf;
uint8_t f[64];
int n;
if (count != sizeof(*attr)) {
fido_log_debug("%s: count=%zu", __func__, count);
return -1;
}
memset(attr, 0, sizeof(*attr));
if ((n = d->io.read(d->io_handle, f, sizeof(f), ms)) < 2 ||
(f[n - 2] << 8 | f[n - 1]) != SW_NO_ERROR) {
fido_log_debug("%s: read", __func__);
return -1;
}
n -= 2;
if (n == sizeof(v_u2f) && memcmp(f, v_u2f, sizeof(v_u2f)) == 0)
attr->flags = FIDO_CAP_CBOR;
else if (n == sizeof(v_fido) && memcmp(f, v_fido, sizeof(v_fido)) == 0)
attr->flags = FIDO_CAP_CBOR | FIDO_CAP_NMSG;
else {
fido_log_debug("%s: unknown version string", __func__);
#ifdef FIDO_FUZZ
attr->flags = FIDO_CAP_CBOR | FIDO_CAP_NMSG;
#else
return -1;
#endif
}
memcpy(&attr->nonce, &d->nonce, sizeof(attr->nonce)); /* XXX */
return (int)count;
}
static int
tx_get_response(fido_dev_t *d, uint8_t count)
{ {
uint8_t apdu[5]; uint8_t apdu[5];
memset(apdu, 0, sizeof(apdu)); memset(apdu, 0, sizeof(apdu));
apdu[0] = cbor ? 0x80 : 0x00;
apdu[1] = 0xc0; /* GET_RESPONSE */ apdu[1] = 0xc0; /* GET_RESPONSE */
apdu[4] = count; apdu[4] = count;
@@ -233,7 +194,7 @@ fail:
} }
static int static int
rx_msg(fido_dev_t *d, unsigned char *buf, size_t count, int ms) rx_msg(fido_dev_t *d, unsigned char *buf, size_t count, int ms, bool cbor)
{ {
uint8_t sw[2]; uint8_t sw[2];
const size_t bufsiz = count; const size_t bufsiz = count;
@@ -244,7 +205,7 @@ rx_msg(fido_dev_t *d, unsigned char *buf, size_t count, int ms)
} }
while (sw[0] == SW1_MORE_DATA) while (sw[0] == SW1_MORE_DATA)
if (tx_get_response(d, sw[1]) < 0 || if (tx_get_response(d, sw[1], cbor) < 0 ||
rx_apdu(d, sw, &buf, &count, &ms) < 0) { rx_apdu(d, sw, &buf, &count, &ms) < 0) {
fido_log_debug("%s: chain", __func__); fido_log_debug("%s: chain", __func__);
return -1; return -1;
@@ -268,12 +229,52 @@ rx_cbor(fido_dev_t *d, unsigned char *buf, size_t count, int ms)
{ {
int r; int r;
if ((r = rx_msg(d, buf, count, ms)) < 2) if ((r = rx_msg(d, buf, count, ms, true)) < 2)
return -1; return -1;
return r - 2; return r - 2;
} }
static int
rx_init(fido_dev_t *d, unsigned char *buf, size_t count, int ms)
{
fido_ctap_info_t *attr = (fido_ctap_info_t *)buf;
uint8_t f[64];
int n;
if (count != sizeof(*attr)) {
fido_log_debug("%s: count=%zu", __func__, count);
return -1;
}
memset(attr, 0, sizeof(*attr));
if ((n = rx_msg(d, f, sizeof(f), ms, false)) < 2 ||
(f[n - 2] << 8 | f[n - 1]) != SW_NO_ERROR) {
fido_log_debug("%s: read", __func__);
return -1;
}
n -= 2;
if (n == sizeof(v_u2f) && memcmp(f, v_u2f, sizeof(v_u2f)) == 0)
attr->flags = FIDO_CAP_CBOR;
else if (n == sizeof(v_fido) && memcmp(f, v_fido, sizeof(v_fido)) == 0)
attr->flags = FIDO_CAP_CBOR | FIDO_CAP_NMSG;
else {
fido_log_debug("%s: unknown version string", __func__);
#ifdef FIDO_FUZZ
attr->flags = FIDO_CAP_CBOR | FIDO_CAP_NMSG;
#else
return -1;
#endif
}
memcpy(&attr->nonce, &d->nonce, sizeof(attr->nonce)); /* XXX */
return (int)count;
}
int int
fido_nfc_rx(fido_dev_t *d, uint8_t cmd, unsigned char *buf, size_t count, int ms) fido_nfc_rx(fido_dev_t *d, uint8_t cmd, unsigned char *buf, size_t count, int ms)
{ {
@@ -283,7 +284,7 @@ fido_nfc_rx(fido_dev_t *d, uint8_t cmd, unsigned char *buf, size_t count, int ms
case CTAP_CMD_CBOR: case CTAP_CMD_CBOR:
return rx_cbor(d, buf, count, ms); return rx_cbor(d, buf, count, ms);
case CTAP_CMD_MSG: case CTAP_CMD_MSG:
return rx_msg(d, buf, count, ms); return rx_msg(d, buf, count, ms, false);
default: default:
fido_log_debug("%s: cmd=%02x", __func__, cmd); fido_log_debug("%s: cmd=%02x", __func__, cmd);
return -1; return -1;