updates

komrade/backend/callers.py

@@ -40,7 +40,7 @@ class Caller(Operator):
         stop
 
         # better have the right keys
-        assert set(KEYMAKER_DEFAULT_KEYS_TO_RETURN) == set(returned_keys.keys())
+        assert set(KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_CLIENT) == set(returned_keys.keys())
 
         # now save these keys!
         saved_keys = self.save_keychain(name,returned_keys,uri_id=uri_id)

komrade/backend/keymaker.py

@@ -188,8 +188,8 @@ class Keymaker(Logger):
     def forge_new_keys(self,
                         name=None,
                         passphrase=DEBUG_DEFAULT_PASSPHRASE,
-                        keys_to_save = KEYMAKER_DEFAULT_KEYS_TO_SAVE,
-                        keys_to_return = KEYMAKER_DEFAULT_KEYS_TO_RETURN,
+                        keys_to_save = KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_SERVER,
+                        keys_to_return = KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_CLIENT,
                         keys_to_gen = KEYMAKER_DEFAULT_KEYS_TO_GEN,
                         key_types = KEYMAKER_DEFAULT_KEY_TYPES):
         self.log('forging new keys...',name,self.name)

komrade/constants.py

@@ -76,13 +76,13 @@ KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_CLIENT = [
 
 KEYMAKER_DEFAULT_KEYS_TO_GEN =  ['pubkey','privkey','adminkey',
                                  '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 += KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_SERVER
+KEYMAKER_DEFAULT_KEYS_TO_GEN += KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_CLIENT
 KEYMAKER_DEFAULT_KEYS_TO_GEN = list(set(KEYMAKER_DEFAULT_KEYS_TO_GEN))
 KEYMAKER_DEFAULT_KEYS_TO_GEN.sort(key=lambda x: x.count('_'))
 
-print('KEYMAKER_DEFAULT_KEYS_TO_SAVE',KEYMAKER_DEFAULT_KEYS_TO_SAVE)
-print('KEYMAKER_DEFAULT_KEYS_TO_RETURN',KEYMAKER_DEFAULT_KEYS_TO_RETURN)
+print('KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_SERVER',KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_SERVER)
+print('KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_CLIENT',KEYMAKER_DEFAULT_KEYS_TO_SAVE_ON_CLIENT)
 print('KEYMAKER_DEFAULT_KEYS_TO_GEN',KEYMAKER_DEFAULT_KEYS_TO_GEN)