finally! abolishing private key property

operator-time
quadrismegistus 4 years ago
parent e6c2cd9211
commit e4a6830690

@ -42,7 +42,7 @@ class Operator(Keymaker):
return b'' return b''
def decrypt_from_send(self,msg_encr,from_pubkey,to_privkey): 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!') self.log('not enough info!')
return b'' return b''
try: try:
@ -50,7 +50,7 @@ class Operator(Keymaker):
msg_b = SMessage( msg_b = SMessage(
to_privkey, to_privkey,
from_pubkey, from_pubkey,
).unwrap(msg_b_encr) ).unwrap(msg_encr)
# decode # decode
msg_json = unpackage_from_transmission(msg_b) msg_json = unpackage_from_transmission(msg_b)
# return # return

@ -71,10 +71,10 @@ def package_for_transmission(data_json):
data_json[k]=v data_json[k]=v
data_json_s = json.dumps(data_json) data_json_s = json.dumps(data_json)
data_json_b = data_json_s.encode() data_json_b = data_json_s.encode()
return data_json_b return b64encode(data_json_b)
def unpackage_from_transmission(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) data_json = json.loads(data_json_s)
for k,v in data_json.items(): for k,v in data_json.items():
if isBase64(v): if isBase64(v):

Loading…
Cancel
Save