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

core/sd_salt: introduce _get_device_dir, _get_salt_path

Browse Source 
prefix dialog functions with underscore
This commit is contained in:
Pavol Rusnak 2019-10-02 15:27:11 +00:00
parent d8cdfea743
commit ede1a0bae3
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
core/src/apps/common/sd_salt.py
View File

@ -23,7 +23,7 @@ SD_SALT_AUTH_TAG_LEN_BYTES = const(16)
SD_SALT_AUTH_KEY_LEN_BYTES = const(16) SD_SALT_AUTH_KEY_LEN_BYTES = const(16)
async def wrong_card_dialog(ctx: Optional[wire.Context]) -> None: async def _wrong_card_dialog(ctx: Optional[wire.Context]) -> None:
text = Text("SD card protection", ui.ICON_WRONG) text = Text("SD card protection", ui.ICON_WRONG)
text.bold("Wrong SD card.") text.bold("Wrong SD card.")
text.br_half() text.br_half()
@ -34,7 +34,7 @@ async def wrong_card_dialog(ctx: Optional[wire.Context]) -> None:
await require_confirm(ctx, text, confirm=None, cancel="Close") await require_confirm(ctx, text, confirm=None, cancel="Close")
async def insert_card_dialog(ctx: Optional[wire.Context]) -> None: async def _insert_card_dialog(ctx: Optional[wire.Context]) -> None:
text = Text("SD card protection") text = Text("SD card protection")
text.bold("SD card required.") text.bold("SD card required.")
text.br_half() text.br_half()
@ -45,17 +45,27 @@ async def insert_card_dialog(ctx: Optional[wire.Context]) -> None:
await require_confirm(ctx, text, confirm=None, cancel="Close") await require_confirm(ctx, text, confirm=None, cancel="Close")
def _get_device_dir() -> bytes:
return "/trezor/device_%s" % storage.device.get_device_id().lower()
def _get_salt_path(new: bool = False) -> bytes:
if new:
return "%s/salt.new" % _get_device_dir()
else:
return "%s/salt" % _get_device_dir()
async def request_sd_salt( async def request_sd_salt(
ctx: Optional[wire.Context], salt_auth_key: bytes ctx: Optional[wire.Context], salt_auth_key: bytes
) -> bytearray: ) -> bytearray:
device_dir = "/trezor/device_%s" % storage.device.get_device_id() salt_path = _get_salt_path()
salt_path = "%s/salt" % device_dir new_salt_path = _get_salt_path(True)
new_salt_path = "%s/salt.new" % device_dir
sd = io.SDCard() sd = io.SDCard()
fs = io.FatFS() fs = io.FatFS()
if not sd.power(True): if not sd.power(True):
await insert_card_dialog(ctx) await _insert_card_dialog(ctx)
raise SdProtectCancelled raise SdProtectCancelled
try: try:
@ -105,19 +115,18 @@ async def request_sd_salt(
fs.unmount() fs.unmount()
sd.power(False) sd.power(False)
await wrong_card_dialog(ctx) await _wrong_card_dialog(ctx)
raise SdProtectCancelled raise SdProtectCancelled
async def set_sd_salt( async def set_sd_salt(
ctx: Optional[wire.Context], salt: bytes, salt_tag: bytes, filename: str = "salt" ctx: Optional[wire.Context], salt: bytes, salt_tag: bytes, filename: str = "salt"
) -> None: ) -> None:
device_dir = "/trezor/device_%s" % storage.device.get_device_id() salt_path = _get_salt_path()
salt_path = "%s/%s" % (device_dir, filename)
sd = io.SDCard() sd = io.SDCard()
if not sd.power(True): if not sd.power(True):
await insert_card_dialog(ctx) await _insert_card_dialog(ctx)
raise SdProtectCancelled raise SdProtectCancelled
fs = io.FatFS() fs = io.FatFS()
@ -125,7 +134,7 @@ async def set_sd_salt(
try: try:
fs.mount() fs.mount()
fs.mkdir("/trezor", True) fs.mkdir("/trezor", True)
fs.mkdir(device_dir, True) fs.mkdir(_get_device_dir(), True)
with fs.open(salt_path, "w") as f: with fs.open(salt_path, "w") as f:
f.write(salt) f.write(salt)
f.write(salt_tag) f.write(salt_tag)
@ -141,14 +150,13 @@ async def stage_sd_salt(
async def commit_sd_salt(ctx: Optional[wire.Context]) -> None: async def commit_sd_salt(ctx: Optional[wire.Context]) -> None:
device_dir = "/trezor/device_%s" % storage.device.get_device_id() salt_path = _get_salt_path()
salt_path = "%s/salt" % device_dir new_salt_path = _get_salt_path(True)
new_salt_path = "%s/salt.new" % device_dir
sd = io.SDCard() sd = io.SDCard()
fs = io.FatFS() fs = io.FatFS()
if not sd.power(True): if not sd.power(True):
await insert_card_dialog(ctx) await _insert_card_dialog(ctx)
raise SdProtectCancelled raise SdProtectCancelled
try: try:
@ -165,13 +173,12 @@ async def commit_sd_salt(ctx: Optional[wire.Context]) -> None:
async def remove_sd_salt(ctx: Optional[wire.Context]) -> None: async def remove_sd_salt(ctx: Optional[wire.Context]) -> None:
device_dir = "/trezor/device_%s" % storage.device.get_device_id() salt_path = _get_salt_path()
salt_path = "%s/salt" % device_dir
sd = io.SDCard() sd = io.SDCard()
fs = io.FatFS() fs = io.FatFS()
if not sd.power(True): if not sd.power(True):
await insert_card_dialog(ctx) await _insert_card_dialog(ctx)
raise SdProtectCancelled raise SdProtectCancelled
try: try: