GlcoinCore/joinmarket
1
0
Fork 0
mirror of https://github.com/JoinMarket-Org/joinmarket-clientserver.git synced 2026-08-13 12:33:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash on bad podle revelation

Browse source
This commit is contained in:
undeath 2018-11-21 01:14:11 +01:00
parent c833aa4df1
commit 286d306ba8
No known key found for this signature in database
GPG key ID: F0DF5443BD2F3520
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
jmclient/jmclient/maker.py
View file

@ -10,7 +10,7 @@ import btc
from jmclient.configure import jm_single
from jmbase.support import get_log
from jmclient.support import (calc_cj_fee)
from jmclient.podle import verify_podle, PoDLE
from jmclient.podle import verify_podle, PoDLE, PoDLEError
from twisted.internet import task
jlog = get_log()
@ -43,13 +43,19 @@ class Maker(object):
"""Receives data on proposed transaction offer from daemon, verifies
commitment, returns necessary data to send ioauth message (utxos etc)
"""
#deserialize the commitment revelation
cr_dict = PoDLE.deserialize_revelation(cr)
#check the validity of the proof of discrete log equivalence
tries = jm_single().config.getint("POLICY", "taker_utxo_retries")
def reject(msg):
jlog.info("Counterparty commitment not accepted, reason: " + msg)
return (False,)
# deserialize the commitment revelation
try:
cr_dict = PoDLE.deserialize_revelation(cr)
except PoDLEError as e:
reason = repr(e)
return reject(reason)
if not verify_podle(str(cr_dict['P']), str(cr_dict['P2']), str(cr_dict['sig']),
str(cr_dict['e']), str(commitment),
index_range=range(tries)):