From aac5a65a78e6fd85e70beb81630bd1e7e4c86f86 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Mon, 14 Sep 2020 21:32:17 +0100 Subject: [PATCH] updates --- komrade/backend/phonelines.py | 2 +- komrade/backend/the_operator.py | 6 +++--- komrade/cli/cli.py | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/komrade/backend/phonelines.py b/komrade/backend/phonelines.py index 2ec1c1a..1bda6e2 100644 --- a/komrade/backend/phonelines.py +++ b/komrade/backend/phonelines.py @@ -17,7 +17,7 @@ def create_phonelines(): keycrypt.set(OPERATOR_NAME,op_pubkey.data,prefix='/pubkey/') keycrypt.set(op_uri,OPERATOR_NAME,prefix='/name/') # keycrypt.set(op_uri,op_privkey.data,prefix='/privkey/') - pass_encr = KomradeSymmetricKeyWithPassphrase().encrypt(op_privkey.data) + # pass_encr = KomradeSymmetricKeyWithPassphrase().encrypt(op_privkey.data) # print('pass_encr',pass_encr) with open(PATH_SUPER_SECRET_OP_KEY,'wb') as of: #of.write(pass_encr) diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py index f1ed974..29b07ec 100644 --- a/komrade/backend/the_operator.py +++ b/komrade/backend/the_operator.py @@ -50,8 +50,8 @@ class TheOperator(Operator): if pub_web.status_code!=200: raise KomradeException("Can't verify Komrade Operator. Shutting down.") - print('Public key on komrade.app/pub: ',pub_web.text) - print('Public key hardcoded in client: ',keychain.get('pubkey').data_b64_s) + # print('Public key on komrade.app/pub: ',pub_web.text) + # print('Public key hardcoded in client: ',keychain.get('pubkey').data_b64_s) if pub_web.text == keychain.get('pubkey').data_b64_s: # print('Pubs match') @@ -76,7 +76,7 @@ class TheOperator(Operator): # exit('invalid password. operator shutting down.') if privkey: self._keychain['privkey']=KomradeAsymmetricPrivateKey(b64dec(privkey)) - print(self._keychain['privkey'],'??') + # print(self._keychain['privkey'],'??') self._keychain = {**self.keychain()} # self.log('@Operator booted with keychain:',dict_format(self._keychain),'and passphrase',self.passphrase) # clear_screen() diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index 861abbe..b80faec 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -5,6 +5,8 @@ import art import textwrap as tw + + class CLI(Logger): ROUTES = { 'help':'seek help',