Wed Mar 7 18:38:18 CET 2007 Jochen Eisinger <coffee@silcnet.org>
[silc.git] / apps / irssi / src / silc / core / silc-channels.c
index bcf4099d1da38a6d9050ef82fa17928cbb258c8b..4311cca5a8963f3b0496005479764076f19c293d 100644 (file)
@@ -1,8 +1,8 @@
 /*
   silc-channels.c : irssi
 
-  Copyright (C) 2000 - 2001, 2004, 2006, 2007 Timo Sirainen
-                Pekka Riikonen <priikone@silcnet.org>
+  Copyright (C) 2000 - 2001, 2004 Timo Sirainen
+                            Pekka Riikonen <priikone@poseidon.pspt.fi>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 #include "silc-commands.h"
 
 void sig_mime(SILC_SERVER_REC *server, SILC_CHANNEL_REC *channel,
-             const char *blob, const char *nick, int verified)
+               const char *blob, const char *nick, int verified)
 {
-  unsigned char *message;
-  SilcUInt32 message_len;
-  SilcMime mime;
+  char type[128], enc[128];
+  unsigned char *data, *message;
+  SilcUInt32 data_len, message_len;
 
   if (!(IS_SILC_SERVER(server)))
     return;
 
   message = silc_unescape_data(blob, &message_len);
 
-  mime = silc_mime_decode(NULL, message, message_len);
-  if (!mime) {
+  memset(type, 0, sizeof(type));
+  memset(enc, 0, sizeof(enc));
+
+  if (!silc_mime_parse(message, message_len, NULL, 0, type, sizeof(type) - 1,
+                enc, sizeof(enc) - 1, &data, &data_len)) {
     silc_free(message);
     return;
   }
 
   printformat_module("fe-common/silc", server,
-                    channel == NULL ? NULL : channel->name,
-                    MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
-                    nick == NULL ? "[<unknown>]" : nick,
-                    silc_mime_get_field(mime, "Content-Type"));
+                      channel == NULL ? NULL : channel->name,
+                      MSGLEVEL_CRAP, SILCTXT_MESSAGE_DATA,
+                      nick == NULL ? "[<unknown>]" : nick, type);
 
   silc_free(message);
-  silc_mime_free(mime);
+
 }
 
 SILC_CHANNEL_REC *silc_channel_create(SILC_SERVER_REC *server,
@@ -111,7 +113,10 @@ static void silc_channels_join(SILC_SERVER_REC *server,
                               const char *channels, int automatic)
 {
   char **list, **tmp;
+  char *channel, *key;
   SILC_CHANNEL_REC *chanrec;
+  CHANNEL_SETUP_REC *schannel;
+  GString *tmpstr;
 
   list = g_strsplit(channels, ",", -1);
   for (tmp = list; *tmp != NULL; tmp++) {
@@ -119,7 +124,25 @@ static void silc_channels_join(SILC_SERVER_REC *server,
     if (chanrec)
       continue;
 
-    silc_command_exec(server, "JOIN", *tmp);
+    channel = *tmp;
+    key = strchr(channel, ' ');
+    if (key != NULL) {
+           *key = '\0';
+           key++;
+    }
+    tmpstr = g_string_new(NULL);
+
+    schannel = channel_setup_find(channel, server->connrec->chatnet);
+    if (key && *key != '\0')
+           g_string_sprintfa(tmpstr, "%s %s", channel, key);
+    else if (schannel && schannel->password && schannel->password[0] != '\0')
+           g_string_sprintfa(tmpstr, "%s %s", channel, schannel->password);
+    else
+           g_string_sprintfa(tmpstr, "%s", channel);
+
+    silc_command_exec(server, "JOIN", tmpstr->str);
+
+    g_string_free(tmpstr, FALSE);
   }
 
   g_strfreev(list);
@@ -136,10 +159,15 @@ static void sig_connected(SILC_SERVER_REC *server)
 
 static void sig_server_quit(SILC_SERVER_REC *server, const char *msg)
 {
-  if (IS_SILC_SERVER(server) && server->conn)
+  if (IS_SILC_SERVER(server) && server->conn && server->conn->sock)
     silc_command_exec(server, "QUIT", msg);
 }
 
+static void sig_gui_quit(SILC_SERVER_REC *server, const char *msg)
+{
+  silc_client_stop(silc_client);
+}
+
 /* Find Irssi channel entry by SILC channel entry */
 
 SILC_CHANNEL_REC *silc_channel_find_entry(SILC_SERVER_REC *server,
@@ -209,7 +237,6 @@ static void command_action(const char *data, SILC_SERVER_REC *server,
   char *message = NULL;
   int target_type;
   void *free_arg;
-  SilcBool sign = FALSE;
 
   CMD_SILC_SERVER(server);
   if (!IS_SILC_SERVER(server) || !server->connected)
@@ -252,23 +279,21 @@ static void command_action(const char *data, SILC_SERVER_REC *server,
 
   if (target != NULL) {
     if (target_type == SEND_TARGET_CHANNEL) {
-      sign = (g_hash_table_lookup(optlist, "sign") ? TRUE :
-             settings_get_bool("sign_channel_messages") ? TRUE : FALSE);
       if (silc_send_channel(server, target, (message != NULL ? message : msg),
                            SILC_MESSAGE_FLAG_ACTION | SILC_MESSAGE_FLAG_UTF8 |
-                           (sign ? SILC_MESSAGE_FLAG_SIGNED : 0))) {
+                           (g_hash_table_lookup(optlist, "sign") != NULL ?
+                            SILC_MESSAGE_FLAG_SIGNED : 0))) {
        if (g_hash_table_lookup(optlist, "sign"))
           signal_emit("message silc signed_own_action", 3, server, msg, target);
        else
           signal_emit("message silc own_action", 3, server, msg, target);
       }
     } else {
-      sign = (g_hash_table_lookup(optlist, "sign") ? TRUE :
-             settings_get_bool("sign_private_messages") ? TRUE : FALSE);
       if (silc_send_msg(server, target, (message != NULL ? message : msg),
                        (message != NULL ? strlen(message) : strlen(msg)),
                        SILC_MESSAGE_FLAG_ACTION | SILC_MESSAGE_FLAG_UTF8 |
-                       (sign ? SILC_MESSAGE_FLAG_SIGNED : 0))) {
+                       (g_hash_table_lookup(optlist, "sign") != NULL ?
+                        SILC_MESSAGE_FLAG_SIGNED : 0))) {
        if (g_hash_table_lookup(optlist, "sign"))
          signal_emit("message silc signed_own_private_action", 3,
                          server, msg, target);
@@ -316,7 +341,6 @@ static void command_notice(const char *data, SILC_SERVER_REC *server,
   char *message = NULL;
   int target_type;
   void *free_arg;
-  SilcBool sign;
 
   CMD_SILC_SERVER(server);
   if (!IS_SILC_SERVER(server) || !server->connected)
@@ -359,23 +383,21 @@ static void command_notice(const char *data, SILC_SERVER_REC *server,
 
   if (target != NULL) {
     if (target_type == SEND_TARGET_CHANNEL) {
-      sign = (g_hash_table_lookup(optlist, "sign") ? TRUE :
-             settings_get_bool("sign_channel_messages") ? TRUE : FALSE);
       if (silc_send_channel(server, target, (message != NULL ? message : msg),
                            SILC_MESSAGE_FLAG_NOTICE | SILC_MESSAGE_FLAG_UTF8 |
-                           (sign ? SILC_MESSAGE_FLAG_SIGNED : 0))) {
+                           (g_hash_table_lookup(optlist, "sign") != NULL ?
+                            SILC_MESSAGE_FLAG_SIGNED : 0))) {
        if (g_hash_table_lookup(optlist, "sign"))
           signal_emit("message silc signed_own_notice", 3, server, msg, target);
        else
           signal_emit("message silc own_notice", 3, server, msg, target);
       }
     } else {
-      sign = (g_hash_table_lookup(optlist, "sign") ? TRUE :
-             settings_get_bool("sign_private_messages") ? TRUE : FALSE);
       if (silc_send_msg(server, target, (message != NULL ? message : msg),
                        (message != NULL ? strlen(message) : strlen(msg)),
                        SILC_MESSAGE_FLAG_NOTICE | SILC_MESSAGE_FLAG_UTF8 |
-                       (sign ? SILC_MESSAGE_FLAG_SIGNED : 0))) {
+                       (g_hash_table_lookup(optlist, "sign") != NULL ?
+                        SILC_MESSAGE_FLAG_SIGNED : 0))) {
        if (g_hash_table_lookup(optlist, "sign"))
          signal_emit("message silc signed_own_private_notice", 3,
                          server, msg, target);
@@ -443,9 +465,9 @@ static void command_away(const char *data, SILC_SERVER_REC *server,
 }
 
 typedef struct {
-  SILC_SERVER_REC *server;
   int type;                    /* 1 = msg, 2 = channel */
-  SilcBool responder;
+  bool responder;
+  SILC_SERVER_REC *server;
 } *KeyInternal;
 
 /* Key agreement callback that is called after the key agreement protocol
@@ -460,7 +482,7 @@ static void keyagr_completion(SilcClient client,
                              SilcClientConnection conn,
                              SilcClientEntry client_entry,
                              SilcKeyAgreementStatus status,
-                             SilcSKEKeyMaterial key,
+                             SilcSKEKeyMaterial *key,
                              void *context)
 {
   KeyInternal i = (KeyInternal)context;
@@ -474,7 +496,7 @@ static void keyagr_completion(SilcClient client,
       /* Set the private key for this client */
       silc_client_del_private_message_key(client, conn, client_entry);
       silc_client_add_private_message_key_ske(client, conn, client_entry,
-                                             NULL, NULL, key);
+                                             NULL, NULL, key, i->responder);
       printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
                         SILCTXT_KEY_AGREEMENT_PRIVMSG,
                         client_entry->nickname);
@@ -484,7 +506,6 @@ static void keyagr_completion(SilcClient client,
     break;
 
   case SILC_KEY_AGREEMENT_ERROR:
-  case SILC_KEY_AGREEMENT_NO_MEMORY:
     printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
                       SILCTXT_KEY_AGREEMENT_ERROR, client_entry->nickname);
     break;
@@ -543,8 +564,8 @@ typedef struct {
 
 static void silc_client_command_key_get_clients(SilcClient client,
                                                SilcClientConnection conn,
-                                               SilcStatus status,
-                                               SilcDList clients,
+                                               SilcClientEntry *clients,
+                                               SilcUInt32 clients_count,
                                                void *context)
 {
   KeyGetClients internal = (KeyGetClients)context;
@@ -570,11 +591,11 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
                        WI_ITEM_REC *item)
 {
   SilcClientConnection conn;
-  SilcClientEntry client_entry = NULL;
-  SilcDList clients;
+  SilcClientEntry *entrys, client_entry = NULL;
+  SilcUInt32 entry_count;
   SILC_CHANNEL_REC *chanrec = NULL;
   SilcChannelEntry channel_entry = NULL;
-  char nickname[128 + 1], *tmp;
+  char *nickname = NULL, *tmp;
   int command = 0, port = 0, type = 0;
   char *hostname = NULL;
   KeyInternal internal = NULL;
@@ -582,10 +603,6 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
   unsigned char **argv;
   SilcUInt32 *argv_lens, *argv_types;
   char *bindhost = NULL;
-  SilcChannelPrivateKey ch = NULL;
-  SilcDList ckeys;
-  SilcBool udp = FALSE;
-  int i;
 
   CMD_SILC_SERVER(server);
 
@@ -613,19 +630,19 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 
   if (type == 1) {
     if (argv[2][0] == '*') {
-      strcpy(nickname, "*");
+      nickname = strdup("*");
     } else {
       /* Parse the typed nickname. */
-      if (!silc_parse_userfqdn(argv[2], nickname, sizeof(nickname), NULL, 0)) {
+      if (!silc_parse_userfqdn(argv[2], &nickname, NULL)) {
        printformat_module("fe-common/silc", server, NULL,
                           MSGLEVEL_CRAP, SILCTXT_BAD_NICK, argv[2]);
        return;
       }
 
       /* Find client entry */
-      clients = silc_client_get_clients_local(silc_client, conn, nickname,
-                                             argv[2]);
-      if (!clients) {
+      entrys = silc_client_get_clients_local(silc_client, conn, nickname,
+                                            argv[2], &entry_count);
+      if (!entrys) {
        KeyGetClients inter = silc_calloc(1, sizeof(*inter));
        inter->server = server;
        inter->data = strdup(data);
@@ -635,9 +652,8 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
                                silc_client_command_key_get_clients, inter);
        goto out;
       }
-
-      client_entry = silc_dlist_get(clients);
-      silc_client_list_free(silc_client, conn, clients);
+      client_entry = entrys[0];
+      silc_free(entrys);
     }
   }
 
@@ -670,17 +686,42 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
     if (argc >= 5) {
       char *cipher = NULL, *hmac = NULL;
 
-      if (argc >= 6)
-       cipher = argv[5];
-      if (argc >= 7)
-       hmac = argv[6];
-
       if (type == 1 && client_entry) {
        /* Set private message key */
+       bool responder = FALSE;
+
        silc_client_del_private_message_key(silc_client, conn, client_entry);
+
+       if (argc >= 6) {
+         if (!strcasecmp(argv[5], "-responder"))
+           responder = TRUE;
+         else
+           cipher = argv[5];
+       }
+       if (argc >= 7) {
+         if (!strcasecmp(argv[6], "-responder"))
+           responder = TRUE;
+         else
+           hmac = argv[6];
+       }
+       if (argc >= 8) {
+         if (!strcasecmp(argv[7], "-responder"))
+           responder = TRUE;
+       }
+
        silc_client_add_private_message_key(silc_client, conn, client_entry,
                                            cipher, hmac,
-                                           argv[4], argv_lens[4]);
+                                           argv[4], argv_lens[4],
+                                           (argv[4][0] == '*' ?
+                                            TRUE : FALSE), responder);
+
+       /* Send the key to the remote client so that it starts using it
+          too. */
+       /* XXX for now we don't do this.  This feature is pretty stupid
+          and should perhaps be removed altogether from SILC.
+       silc_client_send_private_message_key(silc_client, conn,
+                                            client_entry, TRUE);
+       */
       } else if (type == 2) {
        /* Set private channel key */
        if (!(channel_entry->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
@@ -690,6 +731,11 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
          goto out;
        }
 
+       if (argc >= 6)
+         cipher = argv[5];
+       if (argc >= 7)
+         hmac = argv[6];
+
        if (!silc_client_add_channel_private_key(silc_client, conn,
                                                 channel_entry, NULL,
                                                 cipher, hmac,
@@ -719,6 +765,8 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
       silc_client_del_private_message_key(silc_client, conn, client_entry);
     } else if (type == 2) {
       /* Unset channel key(s) */
+      SilcChannelPrivateKey *keys;
+      SilcUInt32 keys_count;
       int number;
 
       if (argc == 4)
@@ -727,24 +775,20 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 
       if (argc > 4) {
        number = atoi(argv[4]);
-       ckeys = silc_client_list_channel_private_keys(silc_client, conn,
-                                                     channel_entry);
-       if (!ckeys)
+       keys = silc_client_list_channel_private_keys(silc_client, conn,
+                                                    channel_entry,
+                                                    &keys_count);
+       if (!keys)
          goto out;
 
-       if (!number || number > silc_dlist_count(ckeys)) {
-         silc_dlist_uninit(ckeys);
+       if (!number || number > keys_count) {
+         silc_client_free_channel_private_keys(keys, keys_count);
          goto out;
        }
 
-       for (i = 0; i < number; i++)
-         ch = silc_dlist_get(ckeys);
-       if (!ch)
-         goto out;
-
        silc_client_del_channel_private_key(silc_client, conn, channel_entry,
-                                           ch);
-       silc_dlist_uninit(ckeys);
+                                           keys[number - 1]);
+       silc_client_free_channel_private_keys(keys, keys_count);
       }
 
       goto out;
@@ -830,33 +874,36 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
       silc_client_free_private_message_keys(keys, keys_count);
 
     } else if (type == 2) {
-      int k, len;
+      SilcChannelPrivateKey *keys;
+      SilcUInt32 keys_count;
+      int k, i, len;
       char buf[1024];
 
-      ckeys = silc_client_list_channel_private_keys(silc_client, conn,
-                                                   channel_entry);
+      keys = silc_client_list_channel_private_keys(silc_client, conn,
+                                                  channel_entry,
+                                                  &keys_count);
 
       printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
                         SILCTXT_CH_PRIVATE_KEY_LIST,
                         channel_entry->channel_name);
 
-      if (!ckeys)
+      if (!keys)
        goto out;
 
-      while ((ch = silc_dlist_get(ckeys))) {
+      for (k = 0; k < keys_count; k++) {
        memset(buf, 0, sizeof(buf));
        strncat(buf, "  ", 2);
 
-       len = strlen(silc_cipher_get_name(ch->cipher));
-       strncat(buf, silc_cipher_get_name(ch->cipher),
+       len = strlen(silc_cipher_get_name(keys[k]->cipher));
+       strncat(buf, silc_cipher_get_name(keys[k]->cipher),
                len > 16 ? 16 : len);
        if (len < 16)
          for (i = 0; i < 16 - len; i++)
            strcat(buf, " ");
        strcat(buf, " ");
 
-       len = strlen(silc_hmac_get_name(ch->hmac));
-       strncat(buf, silc_hmac_get_name(ch->hmac), len > 16 ? 16 : len);
+       len = strlen(silc_hmac_get_name(keys[k]->hmac));
+       strncat(buf, silc_hmac_get_name(keys[k]->hmac), len > 16 ? 16 : len);
        if (len < 16)
          for (i = 0; i < 16 - len; i++)
            strcat(buf, " ");
@@ -867,7 +914,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
        silc_say(silc_client, conn, SILC_CLIENT_MESSAGE_INFO, "%s", buf);
       }
 
-      silc_dlist_uninit(ckeys);
+      silc_client_free_channel_private_keys(keys, keys_count);
     }
 
     goto out;
@@ -879,14 +926,8 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 
     if (argc >= 5)
       hostname = argv[4];
-    if (argc >= 6) {
-      if (!strcasecmp(argv[5], "UDP"))
-       udp = TRUE;
-      else
-       port = atoi(argv[5]);
-    }
-    if (argc >= 7)
-      udp = TRUE;
+    if (argc >= 6)
+      port = atoi(argv[5]);
 
     internal = silc_calloc(1, sizeof(*internal));
     internal->type = type;
@@ -894,6 +935,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 
     if (!hostname) {
       if (settings_get_bool("use_auto_addr")) {
+
         hostname = (char *)settings_get_str("auto_public_ip");
 
        /* If the hostname isn't set, treat this case as if auto_public_ip
@@ -920,14 +962,8 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 
     if (argc >= 5)
       hostname = argv[4];
-    if (argc >= 6) {
-      if (!strcasecmp(argv[5], "UDP"))
-       udp = TRUE;
-      else
-       port = atoi(argv[5]);
-    }
-    if (argc >= 7)
-      udp = TRUE;
+    if (argc >= 6)
+      port = atoi(argv[5]);
 
     internal = silc_calloc(1, sizeof(*internal));
     internal->type = type;
@@ -939,40 +975,39 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
     command = 6;
     if (type == 2) {
       /* Unset channel key(s) */
+      SilcChannelPrivateKey *keys;
+      SilcUInt32 keys_count;
       int number;
 
-      ckeys = silc_client_list_channel_private_keys(silc_client, conn,
-                                                   channel_entry);
-      if (!ckeys)
+      keys = silc_client_list_channel_private_keys(silc_client, conn,
+                                                  channel_entry,
+                                                  &keys_count);
+      if (!keys)
        goto out;
 
       if (argc == 4) {
        chanrec->cur_key++;
-       if (chanrec->cur_key >= silc_dlist_count(ckeys))
+       if (chanrec->cur_key >= keys_count)
          chanrec->cur_key = 0;
       }
 
       if (argc > 4) {
        number = atoi(argv[4]);
-       if (!number || number > silc_dlist_count(ckeys))
+       if (!number || number > keys_count)
          chanrec->cur_key = 0;
        else
          chanrec->cur_key = number - 1;
       }
 
-      for (i = 0; i < chanrec->cur_key; i++)
-       ch = silc_dlist_get(ckeys);
-      if (!ch)
-       goto out;
-
       /* Set the current channel private key */
       silc_client_current_channel_private_key(silc_client, conn,
-                                             channel_entry, ch);
+                                             channel_entry,
+                                             keys[chanrec->cur_key]);
       printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
-                        SILCTXT_CH_PRIVATE_KEY_CHANGE, i + 1,
+                        SILCTXT_CH_PRIVATE_KEY_CHANGE, chanrec->cur_key + 1,
                         channel_entry->channel_name);
 
-      silc_dlist_uninit(ckeys);
+      silc_client_free_channel_private_keys(keys, keys_count);
       goto out;
     }
   }
@@ -985,22 +1020,13 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
   }
 
   if (command == 4 && client_entry) {
-    SilcClientConnectionParams params;
-
     printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
                       SILCTXT_KEY_AGREEMENT, argv[2]);
     internal->responder = TRUE;
-
-    memset(&params, 0, sizeof(params));
-    params.local_ip = hostname;
-    params.bind_ip = bindhost;
-    params.local_port = port;
-    params.udp = udp;
-    params.timeout_secs = settings_get_int("key_exchange_timeout_secs");
-
     silc_client_send_key_agreement(
-                          silc_client, conn, client_entry, &params,
-                          irssi_pubkey, irssi_privkey,
+                          silc_client, conn, client_entry, hostname,
+                          bindhost, port,
+                          settings_get_int("key_exchange_timeout_secs"),
                           keyagr_completion, internal);
     if (!hostname)
       silc_free(internal);
@@ -1008,75 +1034,50 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
   }
 
   if (command == 5 && client_entry && hostname) {
-    SilcClientConnectionParams params;
-
     printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
                       SILCTXT_KEY_AGREEMENT_NEGOTIATE, argv[2]);
     internal->responder = FALSE;
-
-    memset(&params, 0, sizeof(params));
-    if (udp) {
-      if (settings_get_bool("use_auto_addr")) {
-       params.local_ip = (char *)settings_get_str("auto_public_ip");
-       if ((params.local_ip) && (*params.local_ip == '\0')) {
-         params.local_ip = silc_net_localip();
-       } else {
-         params.bind_ip = (char *)settings_get_str("auto_bind_ip");
-         if ((params.bind_ip) && (*params.bind_ip == '\0'))
-           params.bind_ip = NULL;
-         params.local_port = settings_get_int("auto_bind_port");
-       }
-      }
-      if (!params.local_ip)
-       params.local_ip = silc_net_localip();
-    }
-    params.udp = udp;
-    params.timeout_secs = settings_get_int("key_exchange_timeout_secs");
-
-    silc_client_perform_key_agreement(silc_client, conn, client_entry, &params,
-                                     irssi_pubkey, irssi_privkey,
+    silc_client_perform_key_agreement(silc_client, conn, client_entry,
                                      hostname, port, keyagr_completion,
                                      internal);
     goto out;
   }
 
  out:
-  return;
+  silc_free(nickname);
 }
 
 void silc_list_key(const char *pub_filename, int verbose)
 {
   SilcPublicKey public_key;
   SilcPublicKeyIdentifier ident;
-  SilcSILCPublicKey silc_pubkey;
   char *fingerprint, *babbleprint;
   unsigned char *pk;
   SilcUInt32 pk_len;
+  SilcPKCS pkcs;
   SilcUInt32 key_len = 0;
   int is_server_key = (strstr(pub_filename, "serverkeys") != NULL);
 
-  if (!silc_pkcs_load_public_key((char *)pub_filename, &public_key)) {
-    printformat_module("fe-common/silc", NULL, NULL,
-                      MSGLEVEL_CRAP, SILCTXT_LISTKEY_LOADPUB,
-                      pub_filename);
-    return;
-  }
-
-  /* Print only SILC public keys */
-  if (silc_pkcs_get_type(public_key) != SILC_PKCS_SILC) {
-    printformat_module("fe-common/silc", NULL, NULL,
-                      MSGLEVEL_CRAP, SILCTXT_LISTKEY_LOADPUB,
-                      pub_filename);
-    return;
-  }
+  if (silc_pkcs_load_public_key((char *)pub_filename, &public_key,
+                                SILC_PKCS_FILE_PEM) == FALSE)
+    if (silc_pkcs_load_public_key((char *)pub_filename, &public_key,
+                                  SILC_PKCS_FILE_BIN) == FALSE) {
+      printformat_module("fe-common/silc", NULL, NULL,
+                         MSGLEVEL_CRAP, SILCTXT_LISTKEY_LOADPUB,
+                         pub_filename);
+      return;
+    }
 
-  silc_pubkey = silc_pkcs_get_context(SILC_PKCS_SILC, public_key);
-  ident = &silc_pubkey->identifier;
+  ident = silc_pkcs_decode_identifier(public_key->identifier);
 
   pk = silc_pkcs_public_key_encode(public_key, &pk_len);
   fingerprint = silc_hash_fingerprint(NULL, pk, pk_len);
   babbleprint = silc_hash_babbleprint(NULL, pk, pk_len);
-  key_len = silc_pkcs_public_key_get_len(public_key);
+
+  if (silc_pkcs_alloc(public_key->name, &pkcs)) {
+    key_len = silc_pkcs_public_key_set(pkcs, public_key);
+    silc_pkcs_free(pkcs);
+  }
 
   printformat_module("fe-common/silc", NULL, NULL,
                      MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_FILE,
@@ -1085,15 +1086,11 @@ void silc_list_key(const char *pub_filename, int verbose)
   if (verbose)
     printformat_module("fe-common/silc", NULL, NULL,
                        MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_ALG,
-                      silc_pkcs_get_name(public_key));
+                       public_key->name);
   if (key_len && verbose)
     printformat_module("fe-common/silc", NULL, NULL,
                         MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_BITS,
                         (unsigned int)key_len);
-  if (ident->version && verbose)
-    printformat_module("fe-common/silc", NULL, NULL,
-                        MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_VER,
-                        ident->version);
   if (ident->realname && (!is_server_key || verbose))
     printformat_module("fe-common/silc", NULL, NULL,
                        MSGLEVEL_CRAP, SILCTXT_LISTKEY_PUB_RN,
@@ -1132,8 +1129,11 @@ void silc_list_key(const char *pub_filename, int verbose)
   silc_free(babbleprint);
   silc_free(pk);
   silc_pkcs_public_key_free(public_key);
+  silc_pkcs_free_identifier(ident);
+
 }
 
+
 void silc_list_keys_in_dir(const char *dirname, const char *where)
 {
   DIR *dir;
@@ -1142,7 +1142,7 @@ void silc_list_keys_in_dir(const char *dirname, const char *where)
   dir = opendir(dirname);
 
   if (dir == NULL)
-    cmd_return_error(CMDERR_ERRNO);
+         cmd_return_error(CMDERR_ERRNO);
 
   printformat_module("fe-common/silc", NULL, NULL,
                      MSGLEVEL_CRAP, SILCTXT_LISTKEY_LIST,
@@ -1192,6 +1192,7 @@ void silc_list_file(const char *filename)
 list_key:
 
   silc_list_key(path, TRUE);
+
 }
 
 /* Lists locally saved client and server public keys. */
@@ -1239,6 +1240,7 @@ void silc_channels_init(void)
   signal_add("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
   signal_add("server connected", (SIGNAL_FUNC) sig_connected);
   signal_add("server quit", (SIGNAL_FUNC) sig_server_quit);
+  signal_add("gui exit", (SIGNAL_FUNC) sig_gui_quit);
   signal_add("mime", (SIGNAL_FUNC) sig_mime);
 
   command_bind_silc("part", MODULE_NAME, (SIGNAL_FUNC) command_part);
@@ -1261,6 +1263,7 @@ void silc_channels_deinit(void)
   signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
   signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
   signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
+  signal_remove("gui exit", (SIGNAL_FUNC) sig_gui_quit);
   signal_remove("mime", (SIGNAL_FUNC) sig_mime);
 
   command_unbind("part", (SIGNAL_FUNC) command_part);