kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

signed blocks related crashes fixed hopefully

Browse Source
This commit is contained in:
Kevin Froman 2018-04-26 21:14:31 -05:00
parent 28e080fe1a
commit 5086a839ee
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
onionr/communicator.py
View File

@ -277,7 +277,6 @@ class OnionrCommunicate:
pass pass
else: else:
creator = self._utils.getPeerByHashId(blockMetadata['id']) creator = self._utils.getPeerByHashId(blockMetadata['id'])
logger.debug('Proccess blocks: verifying signature by ' + creator)
if self._core._crypto.edVerify(blockContent.split(b'}')[1], creator, blockMetadata['sig'], encodedData=True): if self._core._crypto.edVerify(blockContent.split(b'}')[1], creator, blockMetadata['sig'], encodedData=True):
self._core.updateBlockInfo(i, 'sig', 'true') self._core.updateBlockInfo(i, 'sig', 'true')
else: else:

5
onionr/onionrcrypto.py
View File

@ -44,7 +44,11 @@ class OnionrCrypto:
def edVerify(self, data, key, sig, encodedData=True): def edVerify(self, data, key, sig, encodedData=True):
'''Verify signed data (combined in nacl) to an ed25519 key''' '''Verify signed data (combined in nacl) to an ed25519 key'''
try:
key = nacl.signing.VerifyKey(key=key, encoder=nacl.encoding.Base32Encoder) key = nacl.signing.VerifyKey(key=key, encoder=nacl.encoding.Base32Encoder)
except nacl.bindings.crypto_sign_PUBLICKEYBYTES:
logger.warn('Signature by unknown key (cannot reverse hash)')
return False
retData = False retData = False
sig = base64.b64decode(sig) sig = base64.b64decode(sig)
try: try:
@ -56,6 +60,7 @@ class OnionrCrypto:
retData = key.verify(data, sig) # .encode() is not the same as nacl.encoding retData = key.verify(data, sig) # .encode() is not the same as nacl.encoding
except nacl.exceptions.BadSignatureError: except nacl.exceptions.BadSignatureError:
pass pass
else: else:
try: try:
retData = key.verify(data, sig) retData = key.verify(data, sig)