- Forward keys in hex notation, not as binary data.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 40acfbb..8d03cc0 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.53 2000/10/29 22:55:14 guus Exp $
+    $Id: protocol.c,v 1.28.4.56 2000/11/04 16:54:21 guus Exp $
 */
 
 #include "config.h"
@@ -174,7 +174,7 @@ cp
 int id_h(conn_list_t *cl)
 {
   conn_list_t *old;
-  config_t *cfg;
+  config_t const *cfg;
 cp
   if(sscanf(cl->buffer, "%*d %as %d %lx %hd", &cl->name, &cl->protocol_version, &cl->options, &cl->port) != 4)
     {
@@ -803,6 +803,7 @@ int add_host_h(conn_list_t *cl)
 {
   conn_list_t *old, *new;
   conn_list_t *p;
+
 cp
   new = new_conn_list();
 
@@ -871,6 +872,8 @@ cp
 
   new->nexthop = cl;
   new->status.active = 1;
+  new->cipher_pkttype = EVP_bf_cfb();
+  new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
 
 cp
   return 0;
@@ -1194,7 +1197,7 @@ cp
       return -1;
     }
 
-  /* Update origin's packet key */
+  /* Check correctness of packet key */
 
   keylength = strlen(pktkey);
 
@@ -1206,17 +1209,8 @@ cp
       return -1;
     }
 
-  if(from->cipher_pktkey)
-    free(from->cipher_pktkey);
-
-  keylength /= 2;
-  hex2bin(pktkey, pktkey, keylength);
-  pktkey[keylength] = '\0';
-  from->cipher_pktkey = pktkey;
+  /* Forward it if necessary */
 
-  from->status.validkey = 1;
-  from->status.waitingforkey = 0;
-    
   if(strcmp(to_id, myself->name))
     {
       if(!(to = lookup_id(to_id)))
@@ -1229,6 +1223,19 @@ cp
       send_ans_key(from, to, pktkey);
     }
 
+  /* Update our copy of the origin's packet key */
+
+  if(from->cipher_pktkey)
+    free(from->cipher_pktkey);
+
+  keylength /= 2;
+  hex2bin(pktkey, pktkey, keylength);
+  pktkey[keylength] = '\0';
+  from->cipher_pktkey = pktkey;
+
+  from->status.validkey = 1;
+  from->status.waitingforkey = 0;
+    
   free(from_id); free(to_id);
 cp
   return 0;