updates

komrade/backend/keymaker.py

@@ -384,7 +384,7 @@ class Keymaker(Logger):
         for k,v in keychain.items():
             if issubclass(type(v),KomradeKey):
                 v=v.data
-            # v=b64encode(v)
+            v=b64encode(v)
             keychain[k]=v
             self.log('-->',v)
             # stop

komrade/constants.py

@@ -50,11 +50,16 @@ OPERATOR_INTERCEPT_MESSAGE = "If you'd like to make a call, please hang up and t
 
 
 KEYMAKER_DEFAULT_KEYS_TO_SAVE = ['pubkey_encr', 'privkey_encr', 'adminkey_encr']
-KEYMAKER_DEFAULT_KEYS_TO_RETURN = ['pubkey_decr_decr','pubkey_decr_encr',
-                                   'privkey_decr_decr','privkey_decr_encr',
-                                   'adminkey_decr_decr','adminkey_decr_encr'
-                                   ]
-KEYMAKER_DEFAULT_KEYS_TO_GEN = ['pubkey','privkey','adminkey','pubkey_decr', 'privkey_decr', 'adminkey_decr'] + KEYMAKER_DEFAULT_KEYS_TO_SAVE + KEYMAKER_DEFAULT_KEYS_TO_RETURN
+# KEYMAKER_DEFAULT_KEYS_TO_RETURN =  ['pubkey_decr_encr', 'privkey_decr_encr', 'adminkey_decr_encr']
+KEYMAKER_DEFAULT_KEYS_TO_RETURN =  ['pubkey_decr', 'privkey_decr_encr', 'adminkey_decr_encr']
+# KEYMAKER_DEFAULT_KEYS_TO_RETURN += ['pubkey_decr_decr', 'privkey_decr_decr', 'adminkey_decr_decr']
+KEYMAKER_DEFAULT_KEYS_TO_RETURN += ['privkey_decr_decr', 'adminkey_decr_decr']
+KEYMAKER_DEFAULT_KEYS_TO_GEN =  ['pubkey','privkey','adminkey']
+KEYMAKER_DEFAULT_KEYS_TO_GEN += ['pubkey_decr','privkey_decr', 'adminkey_decr']
+KEYMAKER_DEFAULT_KEYS_TO_GEN += KEYMAKER_DEFAULT_KEYS_TO_SAVE
+KEYMAKER_DEFAULT_KEYS_TO_GEN += KEYMAKER_DEFAULT_KEYS_TO_RETURN
+KEYMAKER_DEFAULT_KEYS_TO_GEN = list(set(KEYMAKER_DEFAULT_KEYS_TO_GEN))
+KEYMAKER_DEFAULT_KEYS_TO_GEN.sort(key=lambda x: x.count('_'))
 
 
 KEY_TYPE_ASYMMETRIC_PUBKEY = 'asymmetric_pubkey'