From 8c853c37f26c1ecac6f7dc9c37c0dce97228c18e Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Mon, 7 Sep 2020 15:51:59 +0100 Subject: [PATCH] updates --- komrade/backend/keymaker.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 15c23c5..a3acac3 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -42,8 +42,8 @@ class KomradeSymmetricKeyWithPassphrase(KomradeSymmetricKey): def data(self): return KEY_TYPE_SYMMETRIC_WITH_PASSPHRASE.encode('utf-8') class KomradeSymmetricKeyWithoutPassphrase(KomradeSymmetricKey): - def __init__(self): - self.key = GenerateSymmetricKey() + def __init__(self,key=None): + self.key = GenerateSymmetricKey() if not key else key @property def data(self): return self.key @@ -386,11 +386,15 @@ class Keymaker(Logger): with open(PATH_BUILTIN_KEYCHAIN,'rb') as f: local_builtin_keychain_encr = b64decode(f.read()) - from mazes import tor_request + print('local',local_builtin_keychain_encr) + + from komrade.backend.mazes import tor_request + from komrade.backend import PATH_OPERATOR_WEB_KEYS_URL remote_builtin_keychain_encr = tor_request(PATH_OPERATOR_WEB_KEYS_URL) - print(local_builtin_keychain_encr) - print(remote_builtin_keychain_encr) + + print('remote',remote_builtin_keychain_encr) + stop def forge_new_keys(self,