arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-28 08:11:02 +00:00
Code Issues Releases Wiki Activity

legacy, core: rename Features.pin_cached to unlocked and unify

Browse Source
This commit is contained in:
Tomas Susanka 2020-06-19 14:04:24 +00:00
parent 67b50f0fc6
commit e534ae3ad7
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/protob/messages-management.proto
View File

@ -50,7 +50,7 @@ message Features {
optional bytes revision = 13; // SCM revision of firmware optional bytes revision = 13; // SCM revision of firmware
optional bytes bootloader_hash = 14; // hash of the bootloader optional bytes bootloader_hash = 14; // hash of the bootloader
optional bool imported = 15; // was storage imported from an external source? optional bool imported = 15; // was storage imported from an external source?
optional bool pin_cached = 16; // is PIN already cached in session? optional bool unlocked = 16; // is the device unlocked? called "pin_cached" previously
// optional bool passphrase_cached = 17; // is passphrase already cached in session? DEPRECATED // optional bool passphrase_cached = 17; // is passphrase already cached in session? DEPRECATED
optional bool firmware_present = 18; // is valid firmware loaded? optional bool firmware_present = 18; // is valid firmware loaded?
optional bool needs_backup = 19; // does storage need backup? (equals to Storage.needs_backup) optional bool needs_backup = 19; // does storage need backup? (equals to Storage.needs_backup)

2
core/src/apps/base.py
View File

@ -33,7 +33,7 @@ def get_features() -> Features:
f.device_id = storage.device.get_device_id() f.device_id = storage.device.get_device_id()
f.label = storage.device.get_label() f.label = storage.device.get_label()
f.pin_protection = config.has_pin() f.pin_protection = config.has_pin()
f.pin_cached = config.is_unlocked() f.unlocked = config.is_unlocked()
f.passphrase_protection = storage.device.is_passphrase_enabled() f.passphrase_protection = storage.device.is_passphrase_enabled()
if utils.BITCOIN_ONLY: if utils.BITCOIN_ONLY:

6
core/src/trezor/messages/Features.py
View File

@ -31,7 +31,7 @@ class Features(p.MessageType):
revision: bytes = None, revision: bytes = None,
bootloader_hash: bytes = None, bootloader_hash: bytes = None,
imported: bool = None, imported: bool = None,
pin_cached: bool = None, unlocked: bool = None,
firmware_present: bool = None, firmware_present: bool = None,
needs_backup: bool = None, needs_backup: bool = None,
flags: int = None, flags: int = None,
@ -66,7 +66,7 @@ class Features(p.MessageType):
self.revision = revision self.revision = revision
self.bootloader_hash = bootloader_hash self.bootloader_hash = bootloader_hash
self.imported = imported self.imported = imported
self.pin_cached = pin_cached self.unlocked = unlocked
self.firmware_present = firmware_present self.firmware_present = firmware_present
self.needs_backup = needs_backup self.needs_backup = needs_backup
self.flags = flags self.flags = flags
@ -104,7 +104,7 @@ class Features(p.MessageType):
13: ('revision', p.BytesType, 0), 13: ('revision', p.BytesType, 0),
14: ('bootloader_hash', p.BytesType, 0), 14: ('bootloader_hash', p.BytesType, 0),
15: ('imported', p.BoolType, 0), 15: ('imported', p.BoolType, 0),
16: ('pin_cached', p.BoolType, 0), 16: ('unlocked', p.BoolType, 0),
18: ('firmware_present', p.BoolType, 0), 18: ('firmware_present', p.BoolType, 0),
19: ('needs_backup', p.BoolType, 0), 19: ('needs_backup', p.BoolType, 0),
20: ('flags', p.UVarintType, 0), 20: ('flags', p.UVarintType, 0),

4
legacy/firmware/fsm_msg_common.h
View File

@ -48,8 +48,8 @@ bool get_features(Features *resp) {
resp->has_initialized = true; resp->has_initialized = true;
resp->initialized = config_isInitialized(); resp->initialized = config_isInitialized();
resp->has_imported = config_getImported(&(resp->imported)); resp->has_imported = config_getImported(&(resp->imported));
resp->has_pin_cached = true; resp->has_unlocked = true;
resp->pin_cached = session_isUnlocked() && config_hasPin(); resp->unlocked = session_isUnlocked();
resp->has_needs_backup = true; resp->has_needs_backup = true;
config_getNeedsBackup(&(resp->needs_backup)); config_getNeedsBackup(&(resp->needs_backup));
resp->has_unfinished_backup = true; resp->has_unfinished_backup = true;

6
python/src/trezorlib/messages/Features.py
View File

@ -31,7 +31,7 @@ class Features(p.MessageType):
revision: bytes = None, revision: bytes = None,
bootloader_hash: bytes = None, bootloader_hash: bytes = None,
imported: bool = None, imported: bool = None,
pin_cached: bool = None, unlocked: bool = None,
firmware_present: bool = None, firmware_present: bool = None,
needs_backup: bool = None, needs_backup: bool = None,
flags: int = None, flags: int = None,
@ -66,7 +66,7 @@ class Features(p.MessageType):
self.revision = revision self.revision = revision
self.bootloader_hash = bootloader_hash self.bootloader_hash = bootloader_hash
self.imported = imported self.imported = imported
self.pin_cached = pin_cached self.unlocked = unlocked
self.firmware_present = firmware_present self.firmware_present = firmware_present
self.needs_backup = needs_backup self.needs_backup = needs_backup
self.flags = flags self.flags = flags
@ -104,7 +104,7 @@ class Features(p.MessageType):
13: ('revision', p.BytesType, 0), 13: ('revision', p.BytesType, 0),
14: ('bootloader_hash', p.BytesType, 0), 14: ('bootloader_hash', p.BytesType, 0),
15: ('imported', p.BoolType, 0), 15: ('imported', p.BoolType, 0),
16: ('pin_cached', p.BoolType, 0), 16: ('unlocked', p.BoolType, 0),
18: ('firmware_present', p.BoolType, 0), 18: ('firmware_present', p.BoolType, 0),
19: ('needs_backup', p.BoolType, 0), 19: ('needs_backup', p.BoolType, 0),
20: ('flags', p.UVarintType, 0), 20: ('flags', p.UVarintType, 0),

2
tests/device_tests/test_msg_changepin_t2.py
View File

@ -29,7 +29,7 @@ pytestmark = pytest.mark.skip_t1
def _check_pin(client, pin): def _check_pin(client, pin):
client.clear_session() client.clear_session()
assert client.features.pin_protection is True assert client.features.pin_protection is True
assert client.features.pin_cached is False assert client.features.unlocked is False
with client: with client:
client.use_pin_sequence([pin]) client.use_pin_sequence([pin])

6
tests/device_tests/test_protection_levels.py
View File

@ -233,8 +233,8 @@ class TestProtectionLevels:
# pass # pass
@pytest.mark.setup_client(pin=PIN4) @pytest.mark.setup_client(pin=PIN4)
def test_pin_cached(self, client): def test_unlocked(self, client):
assert client.features.pin_cached is False assert client.features.unlocked is False
with client: with client:
client.use_pin_sequence([PIN4]) client.use_pin_sequence([PIN4])
@ -242,7 +242,7 @@ class TestProtectionLevels:
btc.get_address(client, "Testnet", [0]) btc.get_address(client, "Testnet", [0])
client.init_device() client.init_device()
assert client.features.pin_cached is True assert client.features.unlocked is True
with client: with client:
client.set_expected_responses([proto.Address()]) client.set_expected_responses([proto.Address()])
btc.get_address(client, "Testnet", [0]) btc.get_address(client, "Testnet", [0])