updates.

diff --git a/CHANGES b/CHANGES
index 6d19d98da3aeea27965023be7fec7de1bf269c06..d168ed8587ee15a0809e2ce7c53e6f879e23fb94 100644 (file)
--- 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 78e31ea0f3b0af79d3977e97939802d8f445e84a..5e818544b7e4ab7c1f566d6733f0cd8e6df848ca 100644 (file)
--- 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 e56e6a55ec872ed1d57b8bc24d0f3b34806f5a0e..4f6758145a562fc6c686479dfee3380bd29eb8ae 100644 (file)
--- 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);