mode = silc_client_chmode(modei,
channel->channel_key->cipher->name,
- channel->hmac->hmac->name);
+ silc_hmac_get_name(channel->hmac));
chanrec = silc_channel_find_entry(server, channel);
if (chanrec != NULL) {
static void command_key(const char *data, SILC_SERVER_REC *server,
WI_ITEM_REC *item)
{
- SilcClientConnection conn = server->conn;
+ SilcClientConnection conn;
SilcClientEntry client_entry = NULL;
SilcChannelEntry channel_entry = NULL;
char *nickname = NULL, *tmp;
unsigned char **argv;
uint32 *argv_lens, *argv_types;
- if (!IS_SILC_SERVER(server) || !server->connected)
+ if (!server || !IS_SILC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
+ conn = server->conn;
+
/* Now parse all arguments */
tmp = g_strconcat("KEY", " ", data, NULL);
silc_parse_command_line(tmp, &argv, &argv_lens, &argv_types, &argc, 7);
if (type == 1) {
if (argv[2][0] == '*') {
- nickname = "*";
+ nickname = strdup("*");
} else {
/* Parse the typed nickname. */
if (!silc_parse_userfqdn(argv[2], &nickname, NULL)) {
}
silc_client_free_private_message_keys(keys, keys_count);
+
} else if (type == 2) {
SilcChannelPrivateKey *keys;
uint32 keys_count;
keys = silc_client_list_channel_private_keys(silc_client, conn,
channel_entry,
&keys_count);
- if (!keys)
- goto out;
-
+
printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
SILCTXT_CH_PRIVATE_KEY_LIST,
channel_entry->channel_name);
+
+ if (!keys)
+ goto out;
+
for (k = 0; k < keys_count; k++) {
memset(buf, 0, sizeof(buf));
strncat(buf, " ", 2);
strcat(buf, " ");
strcat(buf, " ");
- len = strlen(keys[k]->hmac->hmac->name);
- strncat(buf, keys[k]->hmac->hmac->name, 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, " ");