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

[gnunet]

Author: bartpolot
Date: 2015-04-27 21:15:44 +0200 (Mon, 27 Apr 2015)
New Revision: 35642

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- fix Nr counter

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:15:42 UTC 
(rev 35641)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:15:44 UTC 
(rev 35642)
@@ -1026,7 +1026,7 @@
   #if DUMP_KEYS_TO_STDERR
   LOG (GNUNET_ERROR_TYPE_INFO, "  CKs: %s\n",
        GNUNET_h2s ((struct GNUNET_HashCode *) &ax->CKs));
-  LOG (GNUNET_ERROR_TYPE_INFO, "  AX_ENC with key %s\n",
+  LOG (GNUNET_ERROR_TYPE_INFO, "  AX_ENC with key %u: %s\n", ax->Ns,
        GNUNET_h2s ((struct GNUNET_HashCode *) &MK));
   #endif
 
@@ -1068,7 +1068,7 @@
   #if DUMP_KEYS_TO_STDERR
   LOG (GNUNET_ERROR_TYPE_INFO, "  CKr: %s\n",
        GNUNET_h2s ((struct GNUNET_HashCode *) &ax->CKr));
-  LOG (GNUNET_ERROR_TYPE_INFO, "  AX_DEC with key %s\n",
+  LOG (GNUNET_ERROR_TYPE_INFO, "  AX_DEC with key %u: %s\n", ax->Nr,
        GNUNET_h2s ((struct GNUNET_HashCode *) &MK));
   #endif
 
@@ -1346,8 +1346,10 @@
 {
   struct CadetTunnelSkippedKey *key;
   unsigned int i;
+  int gap;
 
-  if (Np - Nr > MAX_KEY_GAP)
+  gap = Np - Nr;
+  if (MAX_KEY_GAP < gap || 0 > gap)
   {
     /* Avoid DoS (forcing peer to do 2*33 chain HMAC operations) */
     /* TODO: start new key exchange on return */
@@ -1452,10 +1454,10 @@
     PNp = ntohl (dstmsg->PNs);
   }
 
-  if (Np > ax->Nr + 1)
+  if (Np > ax->Nr)
     store_ax_keys (t, &ax->HKr, ax->Nr, Np, &ax->CKr);
 
-  ax->Nr = Np;
+  ax->Nr = Np + 1;
 
   osize = t_ax_decrypt (t, dst, &src[1], esize);
   if (osize != esize)