updates

komrade/backend/operators.py

@@ -84,16 +84,16 @@ class Operator(Keymaker):
 
 
     def encrypt_outgoing(self,
-                        json_phone={},
-                        json_caller={},
-                        from_phone_privkey=None,
-                        from_caller_privkey=None,
+                        data_from_sender1={},
+                        data_from_sender2={},
+                        privkey_from_sender1=None,
+                        privkey_from_sender2=None,
                         to_pubkey=None,
                         unencr_header=b''):
         
         
         # 2) encrypt to phone
-        json_phone_encr = self.encrypt_to_send(json_phone,from_phone_privkey,to_pubkey)
+        json_phone_encr = self.encrypt_to_send(data_from_sender1,from_phone_privkey,to_pubkey)
         self.log('json_phone_encr',json_phone_encr)
 
         # 3) to caller

komrade/backend/the_operator.py

@@ -46,23 +46,30 @@ class TheOperator(Operator):
         # decrypt
         self.log('recv 1: got',data)
 
+        # decrypt from phone
         data_in = self.decrypt_incoming(data)
         self.log('recv 2: decrypt gave me',data_in)
 
         # route
-        result = self.route(data_in)
+        encr_result = self.route(data_in)
         self.log('recv 3: route gave me',result)
-        
-        # encrypt
-        data_out = self.encrypt_outgoing(result)
-        self.log('recv 4: encrypt gave me',data_out)
 
         # send
-        return self.send(data_out)
+        return self.send(encr_result)
+
 
+    def send(self,encr_data_b):
+        # telephone v:
+        # unencr_header = self.pubkey_encr_ + BSEP2 + self.op.pubkey_decr_
+        unencr_header = self.phone.pubkey_decr_ + BSEP2 + self.op.pubkey_encr_
+        self.log('unencr_header',unencr_header)
+        
+        total_pkg = unencr_header + BSEP + encr_data_b
+        self.log('total_pkg',total_pkg)
+        total_pkg_b64 = b64encode(total_pkg)
+        self.log('total_pkg_b64',total_pkg_b64)
 
-    def send(self,res):
-        return res
+        return total_pkg_b64
 
 
     def route(self, data):
@@ -83,10 +90,10 @@ class TheOperator(Operator):
         pkg={}
         pkg['name']=data.get('name')
         pkg['_keychain']=res
+
         self.log('returned keys from keymaker.forge_new_keys:','\n'.join(res.keys()))
         
-        # return to_phone,to_caller
-        return (pkg,{})
+