arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-24 15:28:10 +00:00
Code Issues Releases Wiki Activity

feat(storage): Synchronize Optiga and MCU PIN counters.

Browse Source
This commit is contained in:
Andrew Kozlik 2023-10-02 20:25:49 +02:00
parent cb21ca8dc5
commit 90f2b1d790
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
storage/storage.c
View File

@ -1523,11 +1523,32 @@ uint32_t storage_get_pin_rem(void) {
return 0; return 0;
} }
uint32_t ctr = 0; uint32_t ctr_mcu = 0;
if (sectrue != pin_get_fails(&ctr)) { if (sectrue != pin_get_fails(&ctr_mcu)) {
return 0; return 0;
} }
return PIN_MAX_TRIES - ctr;
#if USE_OPTIGA
// Synchronize counters in case they diverged.
uint32_t ctr_optiga = 0;
ensure(
optiga_pin_get_fails(&ctr_optiga) == OPTIGA_SUCCESS ? sectrue : secfalse,
"optiga_pin_get_fails failed");
while (ctr_mcu < ctr_optiga) {
storage_pin_fails_increase();
ctr_mcu++;
}
if (ctr_optiga < ctr_mcu) {
ensure(optiga_pin_fails_increase(ctr_mcu - ctr_optiga) == OPTIGA_SUCCESS
? sectrue
: secfalse,
"optiga_pin_fails_increase failed");
}
#endif
return PIN_MAX_TRIES - ctr_mcu;
} }
secbool storage_change_pin(const uint8_t *oldpin, size_t oldpin_len, secbool storage_change_pin(const uint8_t *oldpin, size_t oldpin_len,