From ff9ae62fd1fbb65edeec8fa954b2f0a6b880ad91 Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Sun, 6 Sep 2020 16:32:12 +0100
Subject: [PATCH] updates

---
 komrade/backend/the_operator.py | 28 ++++++++++++++++++++++++++++
 komrade/constants.py            |  6 +++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py
index 9d39d67..a5234c4 100644
--- a/komrade/backend/the_operator.py
+++ b/komrade/backend/the_operator.py
@@ -80,6 +80,34 @@ def init_operators():
     print()
     print('TELEPHONE_KEYCHAIN =',phone_decr_keys)
 
+    # stringify
+    for k,v in phone_decr_keys.items():
+        v_s = v.decode('utf-8')
+        phone_decr_keys[k]=v_s
+    for k,v in op_decr_keys.items():
+        v_s = v.decode('utf-8')
+        op_decr_keys[k]=v_s
+
+
+    builtin_keychains = {TELEPHONE_NAME:phone_decr_keys, OPERATOR_NAME:op_decr_keys}
+    builtin_keychains_s = json.dumps(builtin_keychains)
+    builtin_keychains_b = builtin_keychains_s.encode('utf-8')
+    
+    builtin_keychains_b_decr = KomradeSymmetricKeyWithoutPassphrase()
+    builtin_keychains_b_encr = builtin_keychains_b_decr.encrypt(builtin_keychains_b)
+
+    builtin_keychains_b_decr_b64 = b64encode(builtin_keychains_b_decr.key)
+    builtin_keychains_b_encr_b64 = b64encode(builtin_keychains_b_encr) 
+
+    with open(PATH_BUILTIN_KEYCHAINS_ENCR,'wb') as of:
+        of.write(builtin_keychains_b_encr_b64)
+        # pickle.dump(builtin_keychains, )
+        print('>> saved:',PATH_BUILTIN_KEYCHAINS_ENCR)
+    with open(PATH_BUILTIN_KEYCHAINS_DECR,'wb') as of:
+        of.write(builtin_keychains_b_decr_b64)
+        print('>> saved:',PATH_BUILTIN_KEYCHAINS_DECR)
+        
+
 
     # op_pub = op.pubkey_decr_
     # phone_pub = phone.pubkey_decr_
diff --git a/komrade/constants.py b/komrade/constants.py
index ce03633..44acb85 100644
--- a/komrade/constants.py
+++ b/komrade/constants.py
@@ -26,11 +26,11 @@ BSEP=b'||||||||||'
 BSEP2=b'@@@@@@@@@@'
 BSEP3=b'##########'
 
-OPERATOR_PUBKEY = b'VUVDMgAAAC1tkzQ1A0FpH7GMJxSJvKASo6U4FknRKadfN7tyXtjclNVoTD7M'
-TELEPHONE_PUBKEY = b'VUVDMgAAAC2NxJDgAsleqZ/UlYioesV5Q7y2p+io+LFXffJRG1JXwftVJHA8'
-TELEPHONE_PRIVKEY = b'UkVDMgAAAC2eWzy+AFkPLGvdBis/rY3tfi8/SFaHn4Xaxj8eDSFmLAwUo68P'
 OPERATOR_NAME = 'TheOperator'
 TELEPHONE_NAME = 'TheTelephone'
+PATH_APP = os.path.abspath(os.path.dirname(__file__))
+PATH_BUILTIN_KEYCHAINS_ENCR = os.path.join(PATH_APP,'.builtin.keychains.encr')
+PATH_BUILTIN_KEYCHAINS_DECR = os.path.join(PATH_APP,'.builtin.keychains.decr')
 
 
 # key names