arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-15 19:08:07 +00:00
Code Issues Releases Wiki Activity

xmr: full mlsag simplified

Browse Source
This commit is contained in:
Dusan Klinec 2018-11-02 14:17:53 +01:00
parent 3d66ba1535
commit 22add1d515
No known key found for this signature in database
GPG Key ID: 6337E118CCBCE103
2 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/apps/monero/signing/step_09_sign_input.py
View File

@ -134,14 +134,14 @@ async def sign_input(
) )
state.mem_trace(4, True) state.mem_trace(4, True)
mg_buffer = []
from apps.monero.xmr import mlsag from apps.monero.xmr import mlsag
if state.rct_type == RctType.Simple: mg_buffer = []
ring_pubkeys = [x.key for x in src_entr.outputs] ring_pubkeys = [x.key for x in src_entr.outputs]
src_entr = None del src_entr
if state.rct_type == RctType.Simple:
mlsag.generate_mlsag_simple( mlsag.generate_mlsag_simple(
state.full_message, state.full_message,
ring_pubkeys, ring_pubkeys,
@ -153,18 +153,15 @@ async def sign_input(
mg_buffer, mg_buffer,
) )
del (ring_pubkeys, input_secret_key, pseudo_out_alpha, pseudo_out_c) del (input_secret_key, pseudo_out_alpha, pseudo_out_c)
else: else:
# Full RingCt, only one input # Full RingCt, only one input
txn_fee_key = crypto.scalarmult_h(state.fee) txn_fee_key = crypto.scalarmult_h(state.fee)
ring_pubkeys = [[x.key] for x in src_entr.outputs]
src_entr = None
mlsag.generate_mlsag_full( mlsag.generate_mlsag_full(
state.full_message, state.full_message,
ring_pubkeys, ring_pubkeys,
[input_secret_key], input_secret_key,
state.output_sk_masks, state.output_sk_masks,
state.output_pk_commitments, state.output_pk_commitments,
kLRki, kLRki,
@ -173,9 +170,9 @@ async def sign_input(
mg_buffer, mg_buffer,
) )
del (ring_pubkeys, input_secret_key, txn_fee_key) del (input_secret_key, txn_fee_key)
del (mlsag, src_entr) del (mlsag, ring_pubkeys)
state.mem_trace(5, True) state.mem_trace(5, True)
from trezor.messages.MoneroTransactionSignInputAck import ( from trezor.messages.MoneroTransactionSignInputAck import (

33
src/apps/monero/xmr/mlsag.py
View File

@ -63,22 +63,12 @@ def generate_mlsag_full(
cols = len(pubs) cols = len(pubs)
if cols == 0: if cols == 0:
raise ValueError("Empty pubs") raise ValueError("Empty pubs")
rows = len(pubs[0]) rows = 1 # Monero uses only one row
if rows == 0:
raise ValueError("Empty pub row")
for i in range(cols):
if len(pubs[i]) != rows:
raise ValueError("pub is not rectangular")
if len(in_sk) != rows:
raise ValueError("Bad inSk size")
if len(out_sk_mask) != len(out_pk_commitments): if len(out_sk_mask) != len(out_pk_commitments):
raise ValueError("Bad outsk/putpk size") raise ValueError("Bad outsk/putpk size")
sk = _key_vector(rows + 1) sk = _key_vector(rows + 1)
M = _key_matrix(rows + 1, cols) M = _key_matrix(rows + 1, cols)
for i in range(rows + 1):
sk[i] = crypto.sc_0()
tmp_mi_rows = crypto.new_point(None) tmp_mi_rows = crypto.new_point(None)
tmp_pt = crypto.new_point(None) tmp_pt = crypto.new_point(None)
@ -86,13 +76,13 @@ def generate_mlsag_full(
for i in range(cols): for i in range(cols):
crypto.identity_into(tmp_mi_rows) # M[i][rows] crypto.identity_into(tmp_mi_rows) # M[i][rows]
for j in range(rows): # Should iterate over rows, simplified as rows == 1
M[i][j] = pubs[i][j].dest M[i][0] = pubs[i].dest
crypto.point_add_into( crypto.point_add_into(
tmp_mi_rows, tmp_mi_rows,
tmp_mi_rows, tmp_mi_rows,
crypto.decodepoint_into(tmp_pt, pubs[i][j].commitment), crypto.decodepoint_into(tmp_pt, pubs[i].commitment),
) )
pubs[i] = None pubs[i] = None
for j in range(len(out_pk_commitments)): for j in range(len(out_pk_commitments)):
@ -106,10 +96,9 @@ def generate_mlsag_full(
crypto.point_sub_into(tmp_mi_rows, tmp_mi_rows, txn_fee_key) crypto.point_sub_into(tmp_mi_rows, tmp_mi_rows, txn_fee_key)
M[i][rows] = crypto.encodepoint(tmp_mi_rows) M[i][rows] = crypto.encodepoint(tmp_mi_rows)
sk[rows] = crypto.sc_0() # Simplified as rows == 1
for j in range(rows): sk[0] = in_sk.dest
sk[j] = in_sk[j].dest sk[rows] = in_sk.mask # originally: sum of all in_sk[0..rows] in sk[rows]
crypto.sc_add_into(sk[rows], sk[rows], in_sk[j].mask) # add masks in last row
for j in range(len(out_pk_commitments)): for j in range(len(out_pk_commitments)):
crypto.sc_sub_into( crypto.sc_sub_into(