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

[gnunet]

Author: bartpolot
Date: 2015-06-17 11:29:10 +0200 (Wed, 17 Jun 2015)
New Revision: 35946

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

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-06-17 09:29:09 UTC 
(rev 35945)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-06-17 09:29:10 UTC 
(rev 35946)
@@ -843,6 +843,19 @@
 
 
 /**
+ * Create a new Axolotl ephemeral (ratchet) key.
+ *
+ * @param t Tunnel.
+ */
+static void
+new_ephemeral (struct CadetTunnel *t)
+{
+  GNUNET_free_non_null (t->ax->DHRs);
+  t->ax->DHRs = GNUNET_CRYPTO_ecdhe_key_create();
+}
+
+
+/**
  * Calculate HMAC.
  *
  * @param plaintext Content to HMAC.
@@ -995,7 +1008,7 @@
     struct GNUNET_HashCode hmac;
     static const char ctx[] = "axolotl ratchet";
 
-    ax->DHRs = GNUNET_CRYPTO_ecdhe_key_create ();
+    new_ephemeral (t);
     ax->HKs = ax->NHKs;
 
     /* RK, NHKs, CKs = KDF( HMAC-HASH(RK, DH(DHRs, DHRr)) ) */
@@ -2654,19 +2667,6 @@
 
 
 /**
- * Create a new Axolotl ephemeral (ratchet) key.
- *
- * @param t Tunnel.
- */
-static void
-new_ephemeral (struct CadetTunnel *t)
-{
-  GNUNET_free_non_null (t->ax->DHRs);
-  t->ax->DHRs = GNUNET_CRYPTO_ecdhe_key_create();
-}
-
-
-/**
  * Free Axolotl data.
  *
  * @param t Tunnel.