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

seed: simplify Keychain.validate_path

Browse Source
This commit is contained in:
Jan Pochyla 2019-04-04 11:41:23 +02:00
parent 7cadefcdd0
commit d1a01bebc5
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/apps/common/seed.py
View File

@ -26,19 +26,9 @@ class Keychain:
del self.seed del self.seed
def validate_path(self, checked_path: list): def validate_path(self, checked_path: list):
empty = True for curve, *path in self.namespaces:
for _, *namespace_path in self.namespaces: if path == checked_path[: len(path)]: # TODO: check curve_name
if empty and len(namespace_path):
empty = False
for i, p in enumerate(namespace_path):
if p != checked_path[i]:
# item did not match, move on to the next allowed path in namespace
break
if i == len(namespace_path) - 1:
# all items match in some namespace path -> success
return return
if not empty:
# checked_path was not among the allowed ones
raise wire.DataError("Forbidden key path") raise wire.DataError("Forbidden key path")
def derive(self, node_path: list, curve_name: str = "secp256k1") -> bip32.HDNode: def derive(self, node_path: list, curve_name: str = "secp256k1") -> bip32.HDNode: