From: Pekka Riikonen <priikone@silcnet.org>
Date: Wed, 29 May 2002 15:01:08 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: silc.toolkit.0.9.2~24
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=a313889ec07613f8b7dd088f078b2afc11e1899c;hp=ca2bc7dc3a846569863335ca44f481806e209a8e;p=silc.git

	updates.
---

diff --git a/CHANGES b/CHANGES
index e0c7eae7..f04510b2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Wed May 29 18:08:15 EEST 2002 Pekka Riikonen <priikone@silcnet.org>
+
+	* Cleanup keys properly.  Affected file is
+	  irssi/src/silc/core/clientutil.c.
+
 Tue May 28 20:11:41 EEST 2002 Pekka Riikonen <priikone@silcnet.org>
 
 	* Display the user mode on the status bar.  Affected file
diff --git a/apps/irssi/src/silc/core/clientutil.c b/apps/irssi/src/silc/core/clientutil.c
index a98b9714..59fb2bac 100644
--- a/apps/irssi/src/silc/core/clientutil.c
+++ b/apps/irssi/src/silc/core/clientutil.c
@@ -223,7 +223,7 @@ New pair of keys will be created.  Please, answer to following questions.\n\
   if (ret_pub_key)
     *ret_pub_key = pub_key;
 
-  memset(key, 0, sizeof(key_len));
+  memset(key, 0, key_len);
   silc_free(key);
 
   /* Save private key into file */
@@ -239,7 +239,7 @@ New pair of keys will be created.  Please, answer to following questions.\n\
   printf("Press <Enter> to continue...\n");
   getchar();
 
-  memset(key, 0, sizeof(key_len));
+  memset(key, 0, key_len);
   silc_free(key);
 
   silc_rng_free(rng);
diff --git a/lib/silcclient/client.c b/lib/silcclient/client.c
index 0d0aeec2..59945b6e 100644
--- a/lib/silcclient/client.c
+++ b/lib/silcclient/client.c
@@ -1340,6 +1340,9 @@ void silc_client_close_connection_real(SilcClient client,
 
   SILC_LOG_DEBUG(("Start"));
 
+  if (!sock && !conn)
+    return;
+
   if (!sock || (sock && conn->sock == sock))
     del = TRUE;
   if (!sock)