arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-04-21 09:39:02 +00:00
Code Issues Releases Wiki Activity

chore(storage): rename DEVICE_SECRET and CRED_AUTH_KEY_COUNTER

Browse Source 
[no changelog]
This commit is contained in:
M1nd3r 2025-04-17 17:47:40 +02:00
parent b18313628a
commit d10b1a5643
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/storage/__init__.py
View File

@ -34,10 +34,10 @@ def reset() -> None:
wipe()
common.set(common.APP_DEVICE, device.DEVICE_ID, device_id.encode(), public=True)
if utils.USE_THP:
common.set(common.APP_DEVICE, device._DEVICE_SECRET, device_secret)
common.set(common.APP_DEVICE, device.DEVICE_SECRET, device_secret)
common.set(
common.APP_DEVICE,
device._CRED_AUTH_KEY_COUNTER,
device.CRED_AUTH_KEY_COUNTER,
credential_counter,
)

12
core/src/storage/device.py
View File

@ -36,8 +36,8 @@ _SAFETY_CHECK_LEVEL = const(0x14) # int
_EXPERIMENTAL_FEATURES = const(0x15) # bool (0x01 or empty)
_HIDE_PASSPHRASE_FROM_HOST = const(0x16) # bool (0x01 or empty)
if utils.USE_THP:
_DEVICE_SECRET = const(0x17) # bytes
_CRED_AUTH_KEY_COUNTER = const(0x18) # bytes
DEVICE_SECRET = const(0x17) # bytes
CRED_AUTH_KEY_COUNTER = const(0x18) # bytes
# unused from python:
# _BRIGHTNESS = const(0x19) # int
_DISABLE_HAPTIC_FEEDBACK = const(0x20) # bool (0x01 or empty)
@ -364,21 +364,21 @@ if utils.USE_THP:
"""
Device secret is used to derive keys that are independent of the seed.
"""
device_secret = common.get(_NAMESPACE, _DEVICE_SECRET)
device_secret = common.get(_NAMESPACE, DEVICE_SECRET)
if not device_secret:
from trezor.crypto import random
device_secret = random.bytes(16, True)
common.set(_NAMESPACE, _DEVICE_SECRET, device_secret)
common.set(_NAMESPACE, DEVICE_SECRET, device_secret)
return device_secret
def get_cred_auth_key_counter() -> bytes:
return common.get(_NAMESPACE, _CRED_AUTH_KEY_COUNTER) or bytes(4)
return common.get(_NAMESPACE, CRED_AUTH_KEY_COUNTER) or bytes(4)
def increment_cred_auth_key_counter() -> None:
counter = int.from_bytes(get_cred_auth_key_counter(), "big")
utils.ensure(counter < 0xFFFFFFFF, "Overflow of cred_auth_key_counter")
common.set(_NAMESPACE, _CRED_AUTH_KEY_COUNTER, (counter + 1).to_bytes(4, "big"))
common.set(_NAMESPACE, CRED_AUTH_KEY_COUNTER, (counter + 1).to_bytes(4, "big"))
def set_haptic_feedback(enable: bool) -> None:

4
core/tests/test_storage.py
View File

@ -40,9 +40,9 @@ class TestConfig(unittest.TestCase):
def test_cred_auth_key_counter_overflow(self):
from storage import common
from storage.device import _CRED_AUTH_KEY_COUNTER, _NAMESPACE
from storage.device import _NAMESPACE, CRED_AUTH_KEY_COUNTER
common.set(_NAMESPACE, _CRED_AUTH_KEY_COUNTER, b"\xff\xff\xff\xfe")
common.set(_NAMESPACE, CRED_AUTH_KEY_COUNTER, b"\xff\xff\xff\xfe")
device.increment_cred_auth_key_counter()
self.assertEqual(device.get_cred_auth_key_counter(), b"\xff\xff\xff\xff")
with self.assertRaises(AssertionError) as e: