From 870400b409ea73fbed1103a4e8e27e506fae490d Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Thu, 10 Sep 2020 15:26:39 +0100 Subject: [PATCH] updates --- komrade/backend/keymaker.py | 4 +--- komrade/utils.py | 7 ++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 504a2be..2fb020a 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -300,9 +300,7 @@ Keymaker ({self}) is forging new keys for {name} # gen encrypted keys! keychain = self.gen_encr_keys(keychain,keys_to_gen,passphrase=passphrase) self.log('I built this keychain!',dict_format(keychain,tab=2)) - - # b64ize? - for k,v in keychain.items(): keychain[k]=b64encode(v) + # save keys! # get URI id to save under (except for pubkeys, accessible by name) diff --git a/komrade/utils.py b/komrade/utils.py index ee6573a..baf7788 100644 --- a/komrade/utils.py +++ b/komrade/utils.py @@ -33,6 +33,11 @@ def do_pause(): def dict_format(d, tab=0): + def repr(v): + if type(v)==bytes and not isBase64(v): + return b64encode(v) + return v + s = ['{\n'] for k,v in sorted(d.items()): if isinstance(v, dict): @@ -41,7 +46,7 @@ def dict_format(d, tab=0): v = repr(v) # s.append('%s%r: %s (%s),\n' % (' '*tab, k, v, type(v).__name__)) - s.append('%s%r: %s,\n\n' % (' '*tab, k, v)) + s.append('%s%r: %s,\n\n' % (' '*tab, k, repr(v))) s.append('%s}' % (' '*tab)) return ''.join(s)