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

core: factor out the decision whether to lock the device

Browse Source
This commit is contained in:
matejcik 2020-04-22 10:54:09 +02:00 committed by matejcik
parent 0600d87c8c
commit 9197623d83
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/apps/common/request_pin.py
View File

@ -17,6 +17,11 @@ if __debug__:
from apps.debug import input_signal from apps.debug import input_signal
def can_lock_device() -> bool:
"""Return True if the device has a PIN set or SD-protect enabled."""
return config.has_pin() or storage.sd_salt.is_enabled()
async def request_pin( async def request_pin(
ctx: wire.GenericContext, ctx: wire.GenericContext,
prompt: str = "Enter your PIN", prompt: str = "Enter your PIN",

4
core/src/boot.py
View File

@ -4,14 +4,14 @@ import storage.sd_salt
from trezor import config, log, loop, res, ui, utils, wire from trezor import config, log, loop, res, ui, utils, wire
from trezor.pin import show_pin_timeout from trezor.pin import show_pin_timeout
from apps.common.request_pin import verify_user_pin from apps.common.request_pin import can_lock_device, verify_user_pin
async def bootscreen() -> None: async def bootscreen() -> None:
ui.display.orientation(storage.device.get_rotation()) ui.display.orientation(storage.device.get_rotation())
while True: while True:
try: try:
if storage.sd_salt.is_enabled() or config.has_pin(): if can_lock_device():
await lockscreen() await lockscreen()
await verify_user_pin() await verify_user_pin()
storage.init_unlocked() storage.init_unlocked()