[GNUnet-SVN] r36145 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2015-07-31 08:58:52 +0200 (Fri, 31 Jul 2015)
New Revision: 36145

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- ignore AX KX when we already know the peer's key, not when the state is 
KEY_OK. This allows the peer to issue a re-key.

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-07-31 06:58:50 UTC 
(rev 36144)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-07-31 06:58:52 UTC 
(rev 36145)
@@ -2908,7 +2908,7 @@
       (GNUNET_CADET_AX_KX_FLAG_FORCE_REPLY & ntohl (msg->flags)))
     GCT_send_ax_kx (t, GNUNET_NO);
 
-  if (CADET_TUNNEL_KEY_OK == t->estate)
+  if (0 == memcmp(&ax->DHRr, &msg->ratchet_key, sizeof(msg->ratchet_key)))
     return;
 
   LOG (GNUNET_ERROR_TYPE_INFO, " is Alice? %s\n", am_I_alice ? "YES" : "NO");