1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 23:08:14 +00:00

nem: small cosmetics in signing

This commit is contained in:
Tomas Susanka 2018-03-26 11:10:15 +02:00 committed by Jan Pochyla
parent 667585041c
commit 0c01c4f4dd

View File

@ -1,5 +1,5 @@
from apps.nem.transaction import *
from apps.nem.layout import * from apps.nem.layout import *
from apps.nem.transaction import *
from apps.nem import helpers from apps.nem import helpers
from apps.common import seed from apps.common import seed
from trezor.messages.NEMSignTx import NEMSignTx from trezor.messages.NEMSignTx import NEMSignTx
@ -12,13 +12,7 @@ async def nem_sign_tx(ctx, msg: NEMSignTx):
node = await seed.derive_node(ctx, msg.transaction.address_n, NEM_CURVE) node = await seed.derive_node(ctx, msg.transaction.address_n, NEM_CURVE)
payload = msg.transfer.payload payload, encrypted = _get_payload(msg, node)
encrypted = False
if msg.transfer.public_key is not None:
if payload is None:
raise ValueError("Public key provided but no payload to encrypt")
payload = _nem_encrypt(node, msg.transfer.public_key, msg.transfer.payload)
encrypted = True
# 0x01 prefix is not part of the actual public key, hence removed # 0x01 prefix is not part of the actual public key, hence removed
public_key = node.public_key()[1:] public_key = node.public_key()[1:]
@ -53,6 +47,18 @@ async def nem_sign_tx(ctx, msg: NEMSignTx):
return resp return resp
def _get_payload(msg: NEMSignTx, node) -> [bytes, bool]:
payload = msg.transfer.payload
encrypted = False
if msg.transfer.public_key is not None:
if payload is None:
raise ValueError("Public key provided but no payload to encrypt")
payload = _nem_encrypt(node, msg.transfer.public_key, msg.transfer.payload)
encrypted = True
return payload, encrypted
def _nem_encrypt(node, public_key: bytes, payload: bytes) -> bytes: def _nem_encrypt(node, public_key: bytes, payload: bytes) -> bytes:
salt = random.bytes(helpers.NEM_SALT_SIZE) salt = random.bytes(helpers.NEM_SALT_SIZE)
iv = random.bytes(helpers.AES_BLOCK_SIZE) iv = random.bytes(helpers.AES_BLOCK_SIZE)