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

[gnunet]

Author: bartpolot
Date: 2014-06-17 14:13:34 +0200 (Tue, 17 Jun 2014)
New Revision: 33693

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
Allow to send traffic with the new key when the rekey period is over. In case 
of a late PONG, very high latency or partial traffic censorship, this will 
allow the receiver to still receive the traffic if the ephemeral key did in 
fact get through.

Additionally it doesn't stop the payload traffic after an interrupted Key 
eXchange, giving a mitm less information about the status of the session.

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-06-17 12:13:33 UTC 
(rev 33692)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-06-17 12:13:34 UTC 
(rev 33693)
@@ -612,6 +612,7 @@
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "  key exchange in progress, started %s ago\n",
          GNUNET_STRINGS_relative_time_to_string (age, GNUNET_YES));
+    // FIXME make duration of old keys configurable
     if (age.rel_value_us < GNUNET_TIME_UNIT_MINUTES.rel_value_us)
     {
       LOG (GNUNET_ERROR_TYPE_DEBUG, "  using old key\n");
@@ -1305,11 +1306,10 @@
          GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
 
     // FIXME make duration of old keys configurable
-    if (duration.rel_value_us > GNUNET_TIME_UNIT_MINUTES.rel_value_us)
+    if (duration.rel_value_us >= GNUNET_TIME_UNIT_MINUTES.rel_value_us)
     {
       memset (&t->kx_ctx->d_key_old, 0, sizeof (t->kx_ctx->d_key_old));
       memset (&t->kx_ctx->e_key_old, 0, sizeof (t->kx_ctx->e_key_old));
-      t->estate = CADET_TUNNEL3_KEY_PING;
     }
   }