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

include nfc in user presence test

Browse Source
This commit is contained in:
Conor Patrick 2019-04-23 14:05:18 -04:00
parent 325396d518
commit eab8b81c95
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fido2/ctap.c
View File

@ -466,12 +466,11 @@ static int ctap_make_auth_data(struct rpId * rp, CborEncoder * map, uint8_t * au
count = auth_data_update_count(&authData->head); count = auth_data_update_count(&authData->head);
device_set_status(CTAPHID_STATUS_UPNEEDED); device_set_status(CTAPHID_STATUS_UPNEEDED);
// if NFC - not need to click a button
int but = 1; int but;
if(!device_is_nfc())
{
but = ctap_user_presence_test(); but = ctap_user_presence_test();
}
if (!but) if (!but)
{ {
@ -704,7 +703,7 @@ uint8_t ctap_make_credential(CborEncoder * encoder, uint8_t * request, int lengt
} }
if (MC.pinAuthEmpty) if (MC.pinAuthEmpty)
{ {
if (!device_is_nfc() && !ctap_user_presence_test()) if (!ctap_user_presence_test())
{ {
return CTAP2_ERR_OPERATION_DENIED; return CTAP2_ERR_OPERATION_DENIED;
} }
@ -1143,7 +1142,7 @@ uint8_t ctap_get_assertion(CborEncoder * encoder, uint8_t * request, int length)
if (GA.pinAuthEmpty) if (GA.pinAuthEmpty)
{ {
if (!device_is_nfc() && !ctap_user_presence_test()) if (!ctap_user_presence_test())
{ {
return CTAP2_ERR_OPERATION_DENIED; return CTAP2_ERR_OPERATION_DENIED;
} }

4
targets/stm32l432/src/device.c
View File

@ -460,6 +460,10 @@ static int handle_packets()
int ctap_user_presence_test() int ctap_user_presence_test()
{ {
int ret; int ret;
if (device_is_nfc())
{
return 1;
}
#if SKIP_BUTTON_CHECK_WITH_DELAY #if SKIP_BUTTON_CHECK_WITH_DELAY
int i=500; int i=500;
while(i--) while(i--)