aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-17 14:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from sr-gi/fix-encoding

Browse Source 
Removes unnecessary encoding when unhexlifying
This commit is contained in:
Sergi Delgado Segura
2019-12-17 11:37:55 +01:00
committed by GitHub
parent af4544b2c0 46a7fa824f
commit 5c01bec89c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/cryptographer.py
View File

@@ -132,7 +132,7 @@ class Cryptographer:
# Decrypt # Decrypt
cipher = ChaCha20Poly1305(sk) cipher = ChaCha20Poly1305(sk)
data = unhexlify(encrypted_blob.data.encode()) data = unhexlify(encrypted_blob.data)
try: try:
blob = cipher.decrypt(nonce=nonce, data=data, associated_data=None) blob = cipher.decrypt(nonce=nonce, data=data, associated_data=None)
@@ -278,7 +278,7 @@ class Cryptographer:
return False return False
if isinstance(signature, str): if isinstance(signature, str):
signature = unhexlify(signature.encode("utf-8")) signature = unhexlify(signature)
try: try:
pk.verify(signature, message, ec.ECDSA(hashes.SHA256())) pk.verify(signature, message, ec.ECDSA(hashes.SHA256()))

2
pisa/inspector.py
View File

@@ -335,7 +335,7 @@ class Inspector:
rcode = errors.APPOINTMENT_EMPTY_FIELD rcode = errors.APPOINTMENT_EMPTY_FIELD
message = "empty signature received" message = "empty signature received"
pk = Cryptographer.load_public_key_der(unhexlify(pk_der.encode("utf-8"))) pk = Cryptographer.load_public_key_der(unhexlify(pk_der))
valid_sig = Cryptographer.verify(Cryptographer.signature_format(appointment), signature, pk) valid_sig = Cryptographer.verify(Cryptographer.signature_format(appointment), signature, pk)
if not valid_sig: if not valid_sig:

2
pisa/utils/zmq_subscriber.py
View File

@@ -28,7 +28,7 @@ class ZMQSubscriber:
body = msg[1] body = msg[1]
if topic == b"hashblock": if topic == b"hashblock":
block_hash = binascii.hexlify(body).decode("UTF-8") block_hash = binascii.hexlify(body).decode("utf-8")
block_queue.put(block_hash) block_queue.put(block_hash)
self.logger.info("New block received via ZMQ", block_hash=block_hash) self.logger.info("New block received via ZMQ", block_hash=block_hash)