From: Bart Polot <bart@net.in.tum.de>
Date: Tue, 17 Jun 2014 12:13:32 +0000 (+0000)
Subject: - only create keys on new ephemeral info
X-Git-Tag: initial-import-from-subversion-38251~3727
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=187e76e43f5b7c18086490b8c7233ebdc8a004dd;p=oweals%2Fgnunet.git

- only create keys on new ephemeral info
---

diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index adc3eb342..227c29fd6 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -400,7 +400,7 @@ is_ready (struct CadetTunnel *t)
   int ready;
 
   GCT_debug (t, GNUNET_ERROR_TYPE_DEBUG);
-  ready = (CADET_TUNNEL3_READY == t->cstate && CADET_TUNNEL3_KEY_OK == t->estate);
+  ready = CADET_TUNNEL3_READY == t->cstate && CADET_TUNNEL3_KEY_OK == t->estate;
   ready = ready || GCT_is_loopback (t);
   return ready;
 }
@@ -1704,8 +1704,12 @@ handle_ephemeral (struct CadetTunnel *t,
     t->kx_ctx->challenge =
         GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
   }
-  t->peers_ephemeral_key = msg->ephemeral_key;
-  create_keys (t);
+  if (0 != memcmp (&t->peers_ephemeral_key, &msg->ephemeral_key,
+                   sizeof (msg->ephemeral_key)))
+  {
+    t->peers_ephemeral_key = msg->ephemeral_key;
+    create_keys (t);
+  }
   if (CADET_TUNNEL3_KEY_SENT == t->estate)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  our key was sent, sending ping\n");