From e6156063f7a9f32af05b2092a14a943d61103e2b Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Wed, 16 Sep 2020 16:17:52 +0100 Subject: [PATCH] updates --- komrade/backend/keymaker.py | 14 +++++++------- komrade/backend/komrades.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 6833392..c676748 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -94,7 +94,7 @@ class KomradeSymmetricKeyWithoutPassphrase(KomradeSymmetricKey): self.key = GenerateSymmetricKey() if not key else key @property def data(self): return self.key - def __repr__(self): return f'[Symmetric Key]\n ({self.discreet})' + def __repr__(self): return f'[Symmetric Key]\n({self.discreet})' @property def cell(self): if not hasattr(self,'_cell'): @@ -136,7 +136,7 @@ class KomradeAsymmetricPublicKey(KomradeAsymmetricKey): @property def data(self): return self.pubkey - def __repr__(self): return f'''[Asymmetric Public Key]\n ({self.data_b64.decode()})''' + def __repr__(self): return f'''[Asymmetric Public Key]\n({self.data_b64.decode()})''' class KomradeAsymmetricPrivateKey(KomradeAsymmetricKey): def __init__(self,privkey,pubkey=None): self.pubkey=pubkey @@ -145,7 +145,7 @@ class KomradeAsymmetricPrivateKey(KomradeAsymmetricKey): def data(self): return self.privkey @property def key(self): return self.privkey - def __repr__(self): return f'''[Asymmetric Private Key]\n ({self.discreet})''' + def __repr__(self): return f'''[Asymmetric Private Key]\n({self.discreet})''' def make_key_discreet(data,chance_unredacted=0.25): import random @@ -177,18 +177,18 @@ class KomradeEncryptedKey(Logger): def __init__(self,data): self.data=data @property def data_b64(self): return b64encode(self.data).decode() - def __repr__(self): return f'[Encrypted Key]\n ({self.discreet})' + def __repr__(self): return f'[Encrypted Key]\n({self.discreet})' @property def discreet(self): return make_key_discreet(self.data) def __str__(self): return repr(self) class KomradeEncryptedAsymmetricPrivateKey(KomradeEncryptedKey): - def __repr__(self): return f'[Encrypted Asymmetric Private Key]\n ({self.discreet})' + def __repr__(self): return f'[Encrypted Asymmetric Private Key]\n({self.discreet})' class KomradeEncryptedAsymmetricPublicKey(KomradeEncryptedKey): - def __repr__(self): return f'[Encrypted Asymmetric Public Key]\n ({self.discreet})' + def __repr__(self): return f'[Encrypted Asymmetric Public Key]\n({self.discreet})' class KomradeEncryptedSymmetricKey(KomradeEncryptedKey): - def __repr__(self): return f'[Encrypted Symmetric Key]\n ({self.discreet})' + def __repr__(self): return f'[Encrypted Symmetric Key]\n({self.discreet})' diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py index eca857e..6ad45cf 100644 --- a/komrade/backend/komrades.py +++ b/komrade/backend/komrades.py @@ -102,12 +102,12 @@ class KomradeX(Caller): # do_pause() # clear_screen() - logfunc(f'Excellent. But to communicate with komrades securely,\nyou must first cut your public & private encryption keys. ') + logfunc(f'Excellent. But to communicate with komrades securely, you must first cut your public & private encryption keys. ') # do_pause() ## 2) Make pub public/private keys keypair = KomradeAsymmetricKey() pubkey,privkey = keypair.pubkey_obj,keypair.privkey_obj - logfunc(f'I have cut for you a private and public asymmetric key pair\nusing the Elliptic Curve algorithm from Themis cryptography library:\n\n(1) {pubkey}\n\n(2) {privkey}{ART_KEY_PAIR}',clear=False,pause=True) + logfunc(f'I have cut for you a private and public asymmetric key pair using the Elliptic Curve algorithm from Themis cryptography library:\n\n(1) {pubkey}\n\n(2) {privkey}{ART_KEY_PAIR}',clear=False,pause=True) ## 3) Have passphrase? if SHOW_STATUS and not passphrase: