arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00
Code Issues Releases Wiki Activity

wallet: do not validate script type in sign message function

Browse Source
This commit is contained in:
Tomas Susanka 2018-11-30 14:43:21 +01:00 committed by Jan Pochyla
parent d5fb2a477a
commit f3c401a5c9
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apps/wallet/sign_message.py
View File

@ -26,6 +26,7 @@ async def sign_message(ctx, msg):
path=msg.address_n,
coin=coin,
script_type=msg.script_type,
validate_script_type=False,
)
node = await seed.derive_node(ctx, address_n, curve_name=coin.curve_name)

6
src/apps/wallet/sign_tx/addresses.py
View File

@ -193,7 +193,7 @@ def address_short(coin: CoinInfo, address: str) -> str:
def validate_full_path(
path: list, coin: CoinInfo, script_type: InputScriptType
path: list, coin: CoinInfo, script_type: InputScriptType, validate_script_type=True
) -> bool:
"""
Validates derivation path to fit Bitcoin-like coins. We mostly use
@ -209,7 +209,9 @@ def validate_full_path(
if not validate_purpose(path[0], coin):
return False
if not validate_purpose_against_script_type(path[0], script_type):
if validate_script_type and not validate_purpose_against_script_type(
path[0], script_type
):
return False
if path[1] != coin.slip44 | HARDENED:

4
tests/test_apps.wallet.address.py
View File

@ -152,6 +152,10 @@ class TestAddress(unittest.TestCase):
for path, input_type in correct_derivation_paths:
self.assertTrue(validate_full_path(path, coin, input_type))
self.assertTrue(validate_full_path([44 | HARDENED, 0 | HARDENED, 0 | HARDENED, 0, 0], coin, InputScriptType.SPENDADDRESS))
self.assertFalse(validate_full_path([44 | HARDENED, 0 | HARDENED, 0 | HARDENED, 0, 0], coin, InputScriptType.SPENDWITNESS))
self.assertTrue(validate_full_path([44 | HARDENED, 0 | HARDENED, 0 | HARDENED, 0, 0], coin, InputScriptType.SPENDWITNESS, validate_script_type=False))
def test_paths_bch(self):
incorrect_derivation_paths = [
([44 | HARDENED], InputScriptType.SPENDADDRESS), # invalid length