Archives/Comrad
2
0
Fork 0
mirror of https://github.com/ComradCollective/Comrad synced 2024-11-17 21:25:37 +00:00
Code Issues Releases Wiki Activity

finally! abolishing private key property

Browse Source
This commit is contained in:
quadrismegistus 2020-09-07 07:30:20 +01:00
parent b2f8ac0052
commit a2fddc30b9
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
komrade/backend/keymaker.py
View File

@ -590,24 +590,7 @@ class Keymaker(Logger):
if passphrase: self.passphrase=passphrase if passphrase: self.passphrase=passphrase
self._keychain = _keychain = {**extra_keys} self._keychain = _keychain = {**extra_keys}
# self.log('_keychain at start of keychain() =',_keychain) self.log('_keychain at start of keychain() =',_keychain)
# # am I a builtin one?
# # self.log('hello///',self.name,self.name in BUILTIN_KEYCHAIN)
# if hasattr(self,'allow_builtin'):
# allow_builtin = allow_builtin and self.allow_builtin
# if self.name in BUILTIN_KEYCHAIN and allow_builtin:
# self.log('??',_keychain)
# # if self.name!=OPERATOR_NAME:
# for k,v in BUILTIN_KEYCHAIN[self.name].items():
# _keychain[k]=v
# self.log('??',_keychain)
# # stop
# self.log('_keychain',_keychain)
# stop
for keyname in keys_to_gen: for keyname in keys_to_gen:
# self.log('??',keyname,'...') # self.log('??',keyname,'...')

4
komrade/backend/the_operator.py
View File

@ -63,8 +63,8 @@ class TheOperator(Operator):
self.log('phone_pubkey_decr',phone_pubkey_decr) self.log('phone_pubkey_decr',phone_pubkey_decr)
# get phone pubkey # get phone pubkey
new_phone_keychain = self.phone.keychain(extra_keys={'pubkey_decr':phone_pubkey_decr}) new_phone_keychain = self.phone.keychain(extra_keys={'pubkey_decr':phone_pubkey_decr},force=True)
new_op_keychain = self.keychain(extra_keys={'privkey_decr':my_privkey_decr}) new_op_keychain = self.keychain(extra_keys={'privkey_decr':my_privkey_decr},force=True)
PHONE_PUBKEY = new_phone_keychain.get('pubkey') PHONE_PUBKEY = new_phone_keychain.get('pubkey')
MY_PRIVKEY = new_op_keychain.get('privkey') MY_PRIVKEY = new_op_keychain.get('privkey')