shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

small fixes

Browse Source
This commit is contained in:
merlokk 2019-02-01 19:15:48 +02:00
parent e2e29492e6
commit e996d470f9
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
targets/stm32l432/src/nfc.c
View File

@ -341,12 +341,22 @@ void nfc_process_iblock(uint8_t * buf, int len)
break; break;
case APDU_FIDO_U2F_VERSION: case APDU_FIDO_U2F_VERSION:
if (NFC_STATE.selected_applet != APP_FIDO) {
nfc_write_response(buf[0], SW_INS_INVALID);
break;
}
printf1(TAG_NFC, "U2F GetVersion command.\r\n"); printf1(TAG_NFC, "U2F GetVersion command.\r\n");
nfc_write_response_ex(buf[0], (uint8_t *)"U2F_V2", 6, SW_SUCCESS); nfc_write_response_ex(buf[0], (uint8_t *)"U2F_V2", 6, SW_SUCCESS);
break; break;
case APDU_FIDO_U2F_REGISTER: case APDU_FIDO_U2F_REGISTER:
if (NFC_STATE.selected_applet != APP_FIDO) {
nfc_write_response(buf[0], SW_INS_INVALID);
break;
}
printf1(TAG_NFC, "U2F Register command.\r\n"); printf1(TAG_NFC, "U2F Register command.\r\n");
if (plen != 64) if (plen != 64)
@ -366,6 +376,11 @@ void nfc_process_iblock(uint8_t * buf, int len)
break; break;
case APDU_FIDO_U2F_AUTHENTICATE: case APDU_FIDO_U2F_AUTHENTICATE:
if (NFC_STATE.selected_applet != APP_FIDO) {
nfc_write_response(buf[0], SW_INS_INVALID);
break;
}
printf1(TAG_NFC, "U2F Authenticate command.\r\n"); printf1(TAG_NFC, "U2F Authenticate command.\r\n");
if (plen != 64 + 1 + buf[6 + 64]) if (plen != 64 + 1 + buf[6 + 64])
@ -386,6 +401,11 @@ void nfc_process_iblock(uint8_t * buf, int len)
break; break;
case APDU_FIDO_NFCCTAP_MSG: case APDU_FIDO_NFCCTAP_MSG:
if (NFC_STATE.selected_applet != APP_FIDO) {
nfc_write_response(buf[0], SW_INS_INVALID);
break;
}
t1 = millis(); t1 = millis();
printf1(TAG_NFC, "FIDO2 CTAP message. %d\r\n", t1); printf1(TAG_NFC, "FIDO2 CTAP message. %d\r\n", t1);
@ -421,7 +441,7 @@ void nfc_process_iblock(uint8_t * buf, int len)
printf1(TAG_ERR, "Truncating requested CC length %d\r\n", apdu->lc); printf1(TAG_ERR, "Truncating requested CC length %d\r\n", apdu->lc);
plen = 15; plen = 15;
} }
nfc_write_response_ex(buf[0], &NFC_CC, plen, SW_SUCCESS); nfc_write_response_ex(buf[0], (uint8_t *)&NFC_CC, plen, SW_SUCCESS);
ams_wait_for_tx(10); ams_wait_for_tx(10);
break; break;
case APP_NDEF_TAG: case APP_NDEF_TAG:
@ -450,10 +470,17 @@ void nfc_process_iblock(uint8_t * buf, int len)
} }
static uint8_t ibuf[1024];
static int ibuflen = 0;
void clear_ibuf()
{
ibuflen = 0;
memset(ibuf, 0, sizeof(ibuf));
}
void nfc_process_block(uint8_t * buf, int len) void nfc_process_block(uint8_t * buf, int len)
{ {
static uint8_t ibuf[1024];
static int ibuflen = 0;
if (!len) if (!len)
return; return;
@ -509,7 +536,7 @@ void nfc_process_block(uint8_t * buf, int len)
// printf1(TAG_NFC, "NFC_CMD_IBLOCK\r\n"); // printf1(TAG_NFC, "NFC_CMD_IBLOCK\r\n");
nfc_process_iblock(buf, len); nfc_process_iblock(buf, len);
} }
ibuflen = 0; clear_ibuf();
} }
} }
else if (IS_RBLOCK(buf[0])) else if (IS_RBLOCK(buf[0]))
@ -527,6 +554,7 @@ void nfc_process_block(uint8_t * buf, int len)
ams_wait_for_tx(2); ams_wait_for_tx(2);
ams_write_command(AMS_CMD_SLEEP); ams_write_command(AMS_CMD_SLEEP);
nfc_state_init(); nfc_state_init();
clear_ibuf();
} }
else else
{ {
@ -610,6 +638,7 @@ void nfc_loop()
t1 = millis(); t1 = millis();
answer_rats(buf[1]); answer_rats(buf[1]);
NFC_STATE.block_num = 1; NFC_STATE.block_num = 1;
clear_ibuf();
printf1(TAG_NFC,"RATS answered %d (took %d)\r\n",millis(), millis() - t1); printf1(TAG_NFC,"RATS answered %d (took %d)\r\n",millis(), millis() - t1);
break; break;
default: default: