arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 15:38:11 +00:00
Code Issues Releases Wiki Activity

src/apps/common/storage: allow U2F counter to be written even when storage is locked

Browse Source
This commit is contained in:
Andrew Kozlik 2019-02-11 16:07:34 +01:00 committed by Pavol Rusnak
parent 6afd9b1d09
commit fd6eb333a6
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/common/storage.py
View File

@ -175,11 +175,11 @@ def set_autolock_delay_ms(delay_ms: int) -> None:
def next_u2f_counter() -> int: def next_u2f_counter() -> int:
return config.next_counter(_APP, _U2F_COUNTER) return config.next_counter(_APP, _U2F_COUNTER, True) # writable when locked
def set_u2f_counter(cntr: int) -> None: def set_u2f_counter(cntr: int) -> None:
config.set_counter(_APP, _U2F_COUNTER, cntr) config.set_counter(_APP, _U2F_COUNTER, cntr, True) # writable when locked
def wipe(): def wipe():
@ -191,9 +191,11 @@ def init_unlocked():
# Check for storage version upgrade. # Check for storage version upgrade.
version = config.get(_APP, _VERSION) version = config.get(_APP, _VERSION)
if version == b"\x01": if version == b"\x01":
# Make the U2F counter public. # Make the U2F counter public and writable even when storage is locked.
counter = config.get(_APP, _U2F_COUNTER) counter = config.get(_APP, _U2F_COUNTER)
if counter is not None: if counter is not None:
config.set_counter(_APP, _U2F_COUNTER, counter) config.set_counter(
_APP, _U2F_COUNTER, counter, True
) # writable when locked
config.delete(_APP, _U2F_COUNTER) config.delete(_APP, _U2F_COUNTER)
config.set(_APP, _VERSION, _STORAGE_VERSION) config.set(_APP, _VERSION, _STORAGE_VERSION)

1
tests/test_apps.common.storage.py
View File

@ -9,7 +9,6 @@ class TestConfig(unittest.TestCase):
def test_counter(self): def test_counter(self):
config.init() config.init()
config.wipe() config.wipe()
self.assertEqual(config.unlock(pin_to_int('')), True)
for i in range(150): for i in range(150):
self.assertEqual(storage.next_u2f_counter(), i) self.assertEqual(storage.next_u2f_counter(), i)
storage.set_u2f_counter(350) storage.set_u2f_counter(350)