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

atomic count

Browse Source
This commit is contained in:
Conor Patrick 2018-10-26 00:15:41 -04:00
parent 528e62173d
commit 27a2e13039
1 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
targets/stm32l442/src/device.c
View File

@ -170,20 +170,57 @@ void authenticator_write_state(AuthenticatorState * a, int backup)
uint32_t * ptr; uint32_t * ptr;
if (! backup) if (! backup)
{ {
ptr = (uint32_t *)(PAGE_SIZE*STATE1_PAGE);
flash_erase_page(STATE1_PAGE); flash_erase_page(STATE1_PAGE);
flash_write(flash_addr(STATE1_PAGE), (uint8_t*)a, sizeof(AuthenticatorState)); flash_write(flash_addr(STATE1_PAGE), (uint8_t*)a, sizeof(AuthenticatorState));
} }
else else
{ {
ptr = (uint32_t *)(PAGE_SIZE*STATE2_PAGE);
flash_erase_page(STATE2_PAGE); flash_erase_page(STATE2_PAGE);
flash_write(flash_addr(STATE2_PAGE), (uint8_t*)a, sizeof(AuthenticatorState)); flash_write(flash_addr(STATE2_PAGE), (uint8_t*)a, sizeof(AuthenticatorState));
} }
} }
uint32_t ctap_atomic_count(int sel)
{
int offset = 0;
uint32_t count;
uint32_t zero = 0;
uint32_t * ptr = (uint32_t *)flash_addr(COUNTER_PAGE);
if (sel != 0)
{
printf2(TAG_ERR,"counter2 not imple\n");
exit(1);
}
for (offset = 0; offset < PAGE_SIZE/4; offset += 1) // wear-level the flash
{
count = *(ptr+offset);
if (count != 0)
{
count++;
offset++;
if (offset == PAGE_SIZE/4)
{
offset = 0;
flash_erase_page(COUNTER_PAGE);
}
else
{
flash_write(flash_addr(COUNTER_PAGE)+offset-1,(uint8_t*)&zero,4);
}
flash_write(flash_addr(COUNTER_PAGE)+offset,(uint8_t*)&count,4);
break;
}
}
return count;
}
void device_manage() void device_manage()
{ {
#if NON_BLOCK_PRINTING #if NON_BLOCK_PRINTING
@ -257,11 +294,6 @@ int ctap_generate_rng(uint8_t * dst, size_t num)
return 1; return 1;
} }
uint32_t ctap_atomic_count(int sel)
{
static uint32_t c = 4;
return c++;
}
int ctap_user_verification(uint8_t arg) int ctap_user_verification(uint8_t arg)
{ {