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

[gnunet]

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

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- remove dead code

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:15:28 UTC 
(rev 35631)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:15:30 UTC 
(rev 35632)
@@ -211,22 +211,6 @@
   unsigned int skipped;
 
   /**
-   * A (double linked) list of staged message keys and associated header keys
-   * for "skipped" messages, before they are commited to the real skipped list.
-   */
-  struct CadetTunnelSkippedKey *staged_head;
-
-  /**
-   * Skipped messages' keys DLL, tail.
-   */
-  struct CadetTunnelSkippedKey *staged_tail;
-
-  /**
-   * Elements in @a staged_head <-> @a staged_head.
-   */
-  unsigned int staged;
-
-  /**
    * 32-byte root key which gets updated by DH ratchet.
    */
   struct GNUNET_CRYPTO_SymmetricSessionKey RK;
@@ -1360,7 +1344,7 @@
  * @param CKr[in/out] Chain key, gets ratcheted forward to the new state.
  */
 static void
-stage_ax_keys (struct CadetTunnel *t,
+store_ax_keys (struct CadetTunnel *t,
                const struct GNUNET_CRYPTO_SymmetricSessionKey *HKr,
                uint32_t Nr, uint32_t Np,
                struct GNUNET_CRYPTO_SymmetricSessionKey *CKr)
@@ -1391,29 +1375,10 @@
     GNUNET_CONTAINER_DLL_insert (t->ax->skipped_head, t->ax->skipped_tail, 
key);
     t->ax->skipped++;
   }
-
-  for (;t->ax->skipped > MAX_SKIPPED_KEYS; t->ax->skipped--)
-  {
-    key = t->ax->skipped_tail;
-    GNUNET_CONTAINER_DLL_remove (t->ax->skipped_head, t->ax->skipped_tail, 
key);
-    GNUNET_free (key);
-  }
 }
 
 
 /**
- * Commit staged keys.
- *
- * @param t Tunnel whose keys to commit.
- */
-static void
-commit_ax_keys (struct CadetTunnel *t)
-{
-  GNUNET_break (0);
-}
-
-
-/**
  * Decrypt and verify data with the appropriate tunnel key and verify that the
  * data has not been altered since it was sent by the remote peer.
  *
@@ -1469,7 +1434,7 @@
     Np = ntohl (dstmsg->Ns);
     PNp = ntohl (dstmsg->PNs);
     DHRp = &dstmsg->DHRs;
-    stage_ax_keys (t, &HK, ax->Nr, PNp, &ax->CKr);
+    store_ax_keys (t, &HK, ax->Nr, PNp, &ax->CKr);
 
     /* RKp, NHKp, CKp = KDF (HMAC-HASH (RK, DH (DHRp, DHRs))) */
     GNUNET_CRYPTO_ecc_ecdh (ax->DHRs, DHRp, &dh);
@@ -1493,8 +1458,7 @@
   }
 
   if (Np > ax->Nr + 1)
-    stage_ax_keys (t, &ax->HKr, ax->Nr, Np, &ax->CKr);
-  commit_ax_keys (t);
+    store_ax_keys (t, &ax->HKr, ax->Nr, Np, &ax->CKr);
 
   ax->Nr = Np;