projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ROBODoc documented lib/silcrypt/silccipher.h. Patch by Toni
[silc.git]
/
apps
/
silcd
/
command.c
diff --git
a/apps/silcd/command.c
b/apps/silcd/command.c
index 4e7a9c79e9989e4154cdd3e405ce1dd26be43dbf..82231d235d89b845833f7d30d1333a295d8a115b 100644
(file)
--- a/
apps/silcd/command.c
+++ b/
apps/silcd/command.c
@@
-1707,6
+1707,7
@@
static void silc_server_command_join_channel(SilcServer server,
bool resolve;
unsigned char *fkey = NULL;
SilcUInt32 fkey_len = 0;
bool resolve;
unsigned char *fkey = NULL;
SilcUInt32 fkey_len = 0;
+ const char *cipher;
SILC_LOG_DEBUG(("Joining client to channel"));
SILC_LOG_DEBUG(("Joining client to channel"));
@@
-1917,12
+1918,11
@@
static void silc_server_command_join_channel(SilcServer server,
if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
tmp = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
tmp = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
+ cipher = silc_cipher_get_name(channel->channel_key);
keyp = silc_channel_key_payload_encode(silc_id_get_len(channel->id,
SILC_ID_CHANNEL),
tmp,
keyp = silc_channel_key_payload_encode(silc_id_get_len(channel->id,
SILC_ID_CHANNEL),
tmp,
- strlen(channel->channel_key->
- cipher->name),
- channel->channel_key->cipher->name,
+ strlen(cipher), cipher,
channel->key_len / 8, channel->key);
silc_free(tmp);
}
channel->key_len / 8, channel->key);
silc_free(tmp);
}
@@
-2611,8
+2611,8
@@
SILC_SERVER_CMD_FUNC(cmode)
silc_server_send_channel_key(server, NULL, channel,
server->server_type == SILC_ROUTER ?
FALSE : !server->standalone);
silc_server_send_channel_key(server, NULL, channel,
server->server_type == SILC_ROUTER ?
FALSE : !server->standalone);
-
- cipher =
channel->channel_key->cipher->name
;
+
+ cipher =
(char *)silc_cipher_get_name(channel->channel_key)
;
hmac = (char *)silc_hmac_get_name(channel->hmac);
}
}
hmac = (char *)silc_hmac_get_name(channel->hmac);
}
}