X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fencr.c;h=e78ed5ec62a859e04f432e2bb728c04f2f12ac6e;hp=899a46b0718bb8dad51bc94a04123aa0e000204c;hb=98de35c742498878a27fb29becd3b7154525a60f;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7

diff --git a/src/encr.c b/src/encr.c
index 899a46b0..e78ed5ec 100644
--- a/src/encr.c
+++ b/src/encr.c
@@ -300,15 +300,11 @@ void recalculate_encryption_keys(void)
   for(p = conn_list; p != NULL; p = p->next)
     {
       if(!p->public_key || !p->public_key->key)
+	/* We haven't received a key from this host (yet). */
 	continue;
       ek = make_shared_key(p->public_key->key);
-      if(!p->key)
-	{
-	  p->key = xmalloc(sizeof(enc_key_t));
-	  p->key->key = NULL;
-	}
-      if(p->key->key)
-	free(p->key->key);
+      free_key(p->key);
+      p->key = xmalloc(sizeof(enc_key_t));
       p->key->length = strlen(ek);
       p->key->expiry = p->public_key->expiry;
       p->key->key = xmalloc(strlen(ek) + 1);