From: Pekka Riikonen <priikone@silcnet.org>
Date: Sat, 30 Aug 2008 11:10:45 +0000 (+0300)
Subject: Fixed channel private key deleting to restore original keys correctly
X-Git-Tag: silc.client.1.1.5~7
X-Git-Url: http://git.silc.fi/gitweb/?p=silc.git;a=commitdiff_plain;h=200cf7d05f4f9d46ce0ec08b906f988fd19747ee

Fixed channel private key deleting to restore original keys correctly
---

diff --git a/lib/silcclient/client_channel.c b/lib/silcclient/client_channel.c
index 1d78d221..32dac873 100644
--- a/lib/silcclient/client_channel.c
+++ b/lib/silcclient/client_channel.c
@@ -626,8 +626,14 @@ SilcBool silc_client_del_channel_private_keys(SilcClient client,
   }
 
   channel->internal.curr_key = NULL;
-  channel->cipher = silc_cipher_get_name(channel->internal.send_key);
-  channel->hmac = silc_hmac_get_name(channel->internal.hmac);
+  if (channel->internal.send_key)
+    channel->cipher = silc_cipher_get_name(channel->internal.send_key);
+  else
+    channel->cipher = NULL;
+  if (channel->hmac)
+    channel->hmac = silc_hmac_get_name(channel->internal.hmac);
+  else
+    channel->hmac = NULL;
 
   silc_dlist_uninit(channel->internal.private_keys);
   channel->internal.private_keys = NULL;