arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-18 21:48:13 +00:00
Code Issues Releases Wiki Activity

feat(storage): Do not lock freshly initialized storage.

Browse Source
This commit is contained in:
Andrew Kozlik 2024-07-06 23:18:42 +02:00 committed by Andrew Kozlik
parent e84f969f4f
commit 1016b0c98a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/storage.c
View File

@ -792,6 +792,7 @@ void storage_init(PIN_UI_WAIT_CALLBACK callback, const uint8_t *salt,
const uint16_t salt_len) {
initialized = secfalse;
unlocked = secfalse;
memzero(cached_keys, sizeof(cached_keys));
norcow_init(&norcow_active_version);
initialized = sectrue;
ui_callback = callback;
@ -810,9 +811,7 @@ void storage_init(PIN_UI_WAIT_CALLBACK callback, const uint8_t *salt,
uint16_t len = 0;
if (secfalse == norcow_get(EDEK_PVC_KEY, &val, &len)) {
init_wiped_storage();
storage_lock();
}
memzero(cached_keys, sizeof(cached_keys));
}
secbool storage_pin_fails_increase(void) {

4
storage/tests/python/src/storage.py
View File

@ -42,7 +42,7 @@ class Storage:
self.pin_log.init()
self._set_wipe_code(consts.WIPE_CODE_EMPTY)
self._set_pin(consts.PIN_EMPTY)
self.unlocked = False
self.unlocked = True
def _set_pin(self, pin: str):
random_salt = prng.random_buffer(consts.PIN_SALT_SIZE)
@ -220,6 +220,8 @@ class Storage:
def _decrypt(self, key: int) -> bytes:
data = self.nc.get(key)
if data is None:
raise RuntimeError("Key not found")
iv = data[: consts.CHACHA_IV_SIZE]
# cipher text with MAC

1
storage/tests/tests/test_set_get.py
View File

@ -237,6 +237,7 @@ def test_set_similar(nc_class):
def test_set_locked(nc_class):
sc, sp = common.init(nc_class)
for s in (sc, sp):
s.lock()
with pytest.raises(RuntimeError):
s.set(0x0303, b"test")
with pytest.raises(RuntimeError):