diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 945f970..6d67e2f 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -20,7 +20,7 @@ class KomradeKey(ABC,Logger): @abstractmethod def data(self): pass @property - def data_b64(self):return b64encode(self.data) + def data_b64(self):return b64encode(self.data) if type(self.data)==bytes else self.data.data_b64 @property def discreet(self): return make_key_discreet(self.data) def __str__(self): diff --git a/komrade/backend/messages.py b/komrade/backend/messages.py index 4a1ff92..5c70098 100644 --- a/komrade/backend/messages.py +++ b/komrade/backend/messages.py @@ -172,8 +172,8 @@ class Message(Logger): # encrypt it! msg_encr = SMessage( - self.from_whom.privkey, - self.to_whom.pubkey, + self.from_whom.privkey.data, + self.to_whom.pubkey.data, ).wrap(msg_b) self.msg_decr = self.msg diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py index 37aa790..a8d26f1 100644 --- a/komrade/backend/operators.py +++ b/komrade/backend/operators.py @@ -199,9 +199,7 @@ class Operator(Keymaker): {ART_PHONE_SM1} ring ring ring! -I am {self}. - -I have been given a message by {from_whom}, and told to pass it onto {to_whom}, by way of the function {get_resp_from}. +I am {self}. I have been given a message by {from_whom}, and told to pass it onto {to_whom}, by way of the function {get_resp_from}. The message is: @@ -221,7 +219,7 @@ The message is: # pass through the telephone wire by the get_resp_from function if not get_resp_from: get_resp_from=to_whom.ring_ring - resp_msg_obj = get_resp_from(msg_obj.msg_d) + resp_msg_obj = get_resp_from(msg_obj.msg_d,from_whom=from_whom) self.log('resp_msg_obj <-',resp_msg_obj) # decrypt diff --git a/komrade/backend/phonelines.py b/komrade/backend/phonelines.py index 75961a9..eeaa38a 100644 --- a/komrade/backend/phonelines.py +++ b/komrade/backend/phonelines.py @@ -82,7 +82,7 @@ def create_phonelines(): if key in world_decr_keys: THIRD_PARTY_DICT[WORLD_NAME][key]=world_decr_keys[key] - #print('THIRD_PARTY_DICT',THIRD_PARTY_DICT) + print('THIRD_PARTY_DICT',THIRD_PARTY_DICT) # store local keys STORE_IN_APP = {OPERATOR_NAME:{}, TELEPHONE_NAME:{}, WORLD_NAME:{}} @@ -95,7 +95,7 @@ def create_phonelines(): for key in world_keys_to_keep_on_client: if key in world_decr_keys: STORE_IN_APP[WORLD_NAME][key]=world_decr_keys[key] - #print('STORE_IN_APP',STORE_IN_APP) + print('STORE_IN_APP',STORE_IN_APP) # package import pickle @@ -106,7 +106,7 @@ def create_phonelines(): omega_key = KomradeSymmetricKeyWithoutPassphrase() STORE_IN_APP_encr = b64encode(omega_key.encrypt(STORE_IN_APP_pkg)) THIRD_PARTY_totalpkg = b64encode(omega_key.data + BSEP + omega_key.encrypt(THIRD_PARTY_DICT_pkg)) - # #print('THIRD_PARTY_totalpkg',THIRD_PARTY_totalpkg) + #print('THIRD_PARTY_totalpkg',THIRD_PARTY_totalpkg) # save with open(PATH_BUILTIN_KEYCHAIN,'wb') as of: