nothing-unencr
quadrismegistus 4 years ago
parent f2251cceed
commit 39198c3d5e

@ -135,9 +135,9 @@ class Operator(Keymaker):
from_phone_keychain = from_phone.keychain() from_phone_keychain = from_phone.keychain()
self.log('from_phone',type(from_phone),'to_phone',type(to_phone)) self.log('from_phone',type(from_phone),'to_phone',type(to_phone))
self.log('from_phone_keychain',from_phone_keychain) self.log('from_phone_keychain',from_phone_keychain)
# self.log('to_phone_keychain',to_phone_keychain) self.log('to_phone_keychain',to_phone_keychain)
eeeee
from_phone_pubkey_encr=from_phone_keychain.get('pubkey_encr') from_phone_pubkey_encr=from_phone_keychain.get('pubkey_encr')
from_phone_privkey=from_phone_keychain.get('privkey') from_phone_privkey=from_phone_keychain.get('privkey')

@ -58,11 +58,12 @@ def hashish(binary_data):
from base64 import b64encode,b64decode from base64 import b64encode,b64decode
import ujson as json import ujson as json
import pickle
def package_for_transmission(data_json): def package_for_transmission(data_json):
# print('package_for_transmission.data_json =',data_json) # print('package_for_transmission.data_json =',data_json)
data_json_bstr = json.dumps(data_json,reject_bytes=False) data_json_b = pickle.dumps(data_json)
# print('package_for_transmission.data_json_b =',data_json_bstr) # print('package_for_transmission.data_json_b =',data_json_bstr)
return b64encode(data_json_bstr.encode()) return b64encode(data_json_b)
def dejsonize(dict): def dejsonize(dict):
@ -76,15 +77,15 @@ def dejsonize(dict):
return dict return dict
def unpackage_from_transmission(data_json_b64): def unpackage_from_transmission(data_json_b64):
print('unpackage_from_transmission.data_json_b64 =',data_json_b64) # print('unpackage_from_transmission.data_json_b64 =',data_json_b64)
data_json_bstr = b64decode(data_json_b64).decode() data_json_b = b64decode(data_json_b64)
print('unpackage_from_transmission.data_json_bstr =',data_json_bstr) print('unpackage_from_transmission.data_json_bstr =',data_json_b)
data_json = json.loads(data_json_bstr) data_json = pickle.loads(data_json_b)
print('unpackage_from_transmission.data_json =',data_json) # print('unpackage_from_transmission.data_json =',data_json)
data_json_dejson = dejsonize(data_json) # data_json_dejson = dejsonize(data_json)
print('unpackage_from_transmission.data_json =',data_json_dejson) # print('unpackage_from_transmission.data_json =',data_json_dejson)
return data_json return data_json

Loading…
Cancel
Save