From 87cdbfba2bb7508a1577b6f88617e38b106bef55 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Thu, 10 Sep 2020 15:47:23 +0100 Subject: [PATCH] updates --- komrade/backend/keymaker.py | 10 ++++++---- komrade/utils.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 75207b1..a305868 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -77,14 +77,16 @@ class KomradeAsymmetricPrivateKey(KomradeAsymmetricKey): class KomradeEncryptedKey(object): def __init__(self,data): self.data=data - def __repr__(self): return f'[Encrypted Key] ({self.data})' + @property + def data_b64(self): return b64encode(self.data) + def __repr__(self): return f'[Encrypted Key] ({self.data_b64})' class KomradeEncryptedAsymmetricPrivateKey(KomradeEncryptedKey): - def __repr__(self): return f'[Encrypted Asymmetric Private Key] ({self.data})' + def __repr__(self): return f'[Encrypted Asymmetric Private Key] ({self.data_b64})' class KomradeEncryptedAsymmetricPublicKey(KomradeEncryptedKey): - def __repr__(self): return f'[Encrypted Asymmetric Public Key] ({self.data})' + def __repr__(self): return f'[Encrypted Asymmetric Public Key] ({self.data_b64})' class KomradeEncryptedSymmetricKey(KomradeEncryptedKey): - def __repr__(self): return f'[Encrypted Symmetric Key] ({self.data})' + def __repr__(self): return f'[Encrypted Symmetric Key] ({self.data_b64})' def get_encrypted_key_obj(data,name_of_encrypted_key): if name_of_encrypted_key.startswith('privkey'): diff --git a/komrade/utils.py b/komrade/utils.py index 9d95121..010fbd9 100644 --- a/komrade/utils.py +++ b/komrade/utils.py @@ -47,7 +47,7 @@ def dict_format(d, tab=0): # s.append('%s%r: %s (%s),\n' % (' '*tab, k, v, type(v).__name__)) s.append('%s%r: %s,\n\n' % (' '*tab, k, repr(v))) - s.append('\n%s}' % (' '*tab)) + s.append('%s}' % (' '*tab)) return ''.join(s) import inspect