From e4a6830690f07dfdf98e571b3884b6bd87d9259a Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Mon, 7 Sep 2020 12:32:51 +0100 Subject: [PATCH] finally! abolishing private key property --- komrade/backend/operators.py | 4 ++-- komrade/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py index b835330..0acd4bd 100644 --- a/komrade/backend/operators.py +++ b/komrade/backend/operators.py @@ -42,7 +42,7 @@ class Operator(Keymaker): return b'' def decrypt_from_send(self,msg_encr,from_pubkey,to_privkey): - if not msg_b_encr or not from_privkey or not to_pubkey: + if not msg_encr or not from_privkey or not to_pubkey: self.log('not enough info!') return b'' try: @@ -50,7 +50,7 @@ class Operator(Keymaker): msg_b = SMessage( to_privkey, from_pubkey, - ).unwrap(msg_b_encr) + ).unwrap(msg_encr) # decode msg_json = unpackage_from_transmission(msg_b) # return diff --git a/komrade/utils.py b/komrade/utils.py index 3e4db27..fa65b6b 100644 --- a/komrade/utils.py +++ b/komrade/utils.py @@ -71,10 +71,10 @@ def package_for_transmission(data_json): data_json[k]=v data_json_s = json.dumps(data_json) data_json_b = data_json_s.encode() - return data_json_b + return b64encode(data_json_b) def unpackage_from_transmission(data_json_b): - data_json_s = data_json_b.decode() + data_json_s = b64decode(data_json_b).decode() data_json = json.loads(data_json_s) for k,v in data_json.items(): if isBase64(v):