From 05a13e6883aeb56fc920bbf6f97807ccdd02aa47 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Sun, 13 Sep 2020 20:25:43 +0100 Subject: [PATCH] updates --- komrade/backend/keymaker.py | 6 +++--- komrade/backend/the_operator.py | 4 ++-- komrade/backend/the_telephone.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 6db6949..37d330f 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -246,7 +246,7 @@ class Keymaker(Logger): self.name=name self._uri_id=uri_id self._pubkey=None - self._keychain=keychain + self._keychain={**keychain} self.path_crypt_keys=path_crypt_keys self.path_crypt_data=path_crypt_data @@ -344,7 +344,7 @@ class Keymaker(Logger): keys = self.assemble(self.assemble(keys,passphrase=passphrase),passphrase=passphrase) #store to existing set - self._keychain = keys + self._keychain = {**keys} #return return keys @@ -602,7 +602,7 @@ Keymaker ({self}) is forging new keys for {name} self.save_uri_as_qrcode(name=name, uri_id=uri_id) # set to my keychain right away - self._keychain = keychain + self._keychain = {**keychain} return (uri_id,keys_saved_d,keychain) diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py index 928fe8b..2e9bab6 100644 --- a/komrade/backend/the_operator.py +++ b/komrade/backend/the_operator.py @@ -35,8 +35,8 @@ class TheOperator(Operator): ) from komrade.backend.phonelines import check_phonelines keychain = check_phonelines()[OPERATOR_NAME] - self._keychain = self.load_keychain_from_bytes(keychain) - self._keychain = self.keychain() + self._keychain = {**self.load_keychain_from_bytes(keychain)} + self._keychain = {**self.keychain()} # self.log('@Operator booted with keychain:',dict_format(self._keychain),'and passphrase',self.passphrase) clear_screen() diff --git a/komrade/backend/the_telephone.py b/komrade/backend/the_telephone.py index d1081a3..d2a7372 100644 --- a/komrade/backend/the_telephone.py +++ b/komrade/backend/the_telephone.py @@ -14,7 +14,7 @@ class TheTelephone(Operator): self.caller=caller from komrade.backend.phonelines import check_phonelines keychain = check_phonelines()[TELEPHONE_NAME] - self._keychain = self.load_keychain_from_bytes(keychain) + self._keychain ={**self.load_keychain_from_bytes(keychain)} def send_and_receive(self,msg_d,**y):