From f2a80789c2a6592201196e9419d393ee6367a481 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Sun, 6 Sep 2020 19:02:18 +0100 Subject: [PATCH] updates --- komrade/backend/keymaker.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 06e2fa6..bd80f89 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -406,14 +406,7 @@ class Keymaker(Logger): # for k,v in keychain_tosave.items(): if 'pubkey' in keys_to_save or 'privkey' in keys_to_save or 'adminkey' in keys_to_save: raise KomradeException('there is no private property in a socialist network! all keys must be split between komrades') - - keychain_toreturn = {} - for key in keys_to_return: - if key in keychain: - print('adding',key,'to returned keychain') - keychain_toreturn[key]=keychain[key] - - + ### SAVE ENCRYPTED KEYS? if 'pubkey_encr' in keys_to_save: self.crypt_keys.set(name,keychain['pubkey_encr'],prefix='/pubkey_encr/') @@ -459,6 +452,15 @@ class Keymaker(Logger): self.crypt_keys.set(keychain['privkey_decr'],keychain['adminkey_decr_decr'],prefix='/adminkey_decr_decr/') + + keychain_toreturn = {} + for key in keys_to_return: + if key in keychain: + print('adding',key,'to returned keychain') + keychain_toreturn[key]=keychain[key] + + return keychain_toreturn + @property