From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 13 Sep 2001 20:11:40 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: silcertest~110
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=7f16072a5661f2e78d5d9db890f7664af3495450;p=silc.git

	updates.
---

diff --git a/CHANGES b/CHANGES
index 6d19d98d..d168ed85 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Thu Sep 13 23:11:18 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
+
+	* When printing the channel mode on JOIN, verify that the
+	  channel key and channel's HMAC are valid.  Affected file
+	  irssi/src/silc/core/client_ops.c.
+
 Thu Sep 13 20:24:52 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
 
 	* Added defines SILC_DEFAULT_CIPHER, SILC_DEFAULT_HMAC,
diff --git a/TODO b/TODO
index 78e31ea0..5e818544 100644
--- a/TODO
+++ b/TODO
@@ -6,6 +6,9 @@ TODO/bugs in Irssi SILC client
    keys is not possible because changing the key is not possible by the
    user.
 
+ o JOINing to +a (requires passphrase to JOIN) does not work on autojoin.
+   Seems the passwords in the .silc/config has no effect.
+
  o Add local commands to list the current server and client public keys
    that the user has.  And a local command to dump the contents of the
    public key to the screen.  Something like LISTKEYS, SHOWKEY...
diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c
index e56e6a55..4f675814 100644
--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
@@ -522,8 +522,10 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
       }
 
       mode = silc_client_chmode(modei, 
-				channel_entry->channel_key->cipher->name,
-				channel_entry->hmac->hmac->name);
+				channel_entry->channel_key ? 
+				channel_entry->channel_key->cipher->name : "",
+				channel_entry->hmac ? 
+				channel_entry->hmac->hmac->name : "");
       g_free_not_null(chanrec->mode);
       chanrec->mode = g_strdup(mode == NULL ? "" : mode);
       signal_emit("channel mode changed", 1, chanrec);