int force_send)
{
int i;
- SilcSocketConnection sock = conn->sock;
+ SilcSocketConnection sock;
SilcBuffer payload;
SilcPacketContext packetdata;
const SilcBufferStruct packet;
int block_len;
SilcChannelUser chu;
+ assert(client && conn && channel);
+ sock = conn->sock;
SILC_LOG_DEBUG(("Sending packet to channel"));
chu = silc_client_on_channel(channel, conn->local_entry);
for (i = 0; i < iv_len; i++) channel->iv[i] =
silc_rng_get_byte(client->rng);
else
- silc_hash_make(client->internal->md5hash, channel->iv, iv_len,
- channel->iv);
+ silc_hash_make(client->md5hash, channel->iv, iv_len, channel->iv);
/* Encode the channel payload. This also encrypts the message payload. */
payload = silc_channel_message_payload_encode(flags, data_len, data, iv_len,
client->rng);
/* Get data used in packet header encryption, keys and stuff. */
- cipher = conn->send_key;
- hmac = conn->hmac_send;
+ cipher = conn->internal->send_key;
+ hmac = conn->internal->hmac_send;
id_string = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
/* Set the packet context pointers. The destination ID is always
/* Encrypt the header and padding of the packet. This is encrypted
with normal session key shared with our server. */
- silc_packet_encrypt(cipher, hmac, conn->psn_send++,
+ silc_packet_encrypt(cipher, hmac, conn->internal->psn_send++,
(SilcBuffer)&packet, SILC_PACKET_HEADER_LEN +
packetdata.src_id_len + packetdata.dst_id_len +
packetdata.padlen);
/* Find client entry */
client_entry = silc_client_get_client_by_id(client, conn, client_id);
- if (!client_entry || !client_entry->nickname) {
+ if (!client_entry || !client_entry->nickname ||
+ !silc_client_on_channel(channel, client_entry)) {
/* Resolve the client info */
SilcChannelClientResolve res = silc_calloc(1, sizeof(*res));
res->payload = payload;
res->channel_id = id;
- silc_client_get_client_by_id_resolve(client, conn, client_id,
+ silc_client_get_client_by_id_resolve(client, conn, client_id, NULL,
silc_client_channel_message_cb,
res);
payload = NULL;
goto out;
}
- if (!silc_client_on_channel(channel, client_entry)) {
- SILC_LOG_WARNING(("Received channel message from client not on channel"));
- goto out;
- }
-
message = silc_channel_message_get_data(payload, &message_len);
/* Pass the message to application */
unsigned char hash[32];
SilcSKEKeyMaterial *keymat;
+ assert(client && channel);
+
if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY))
return FALSE;
/* Produce the key material */
keymat = silc_calloc(1, sizeof(*keymat));
if (silc_ske_process_key_material_data(key, key_len, 16, 256, 16,
- client->internal->md5hash, keymat)
+ client->md5hash, keymat)
!= SILC_SKE_STATUS_OK)
return FALSE;
{
SilcChannelPrivateKey entry;
+ assert(client && channel);
+
if (!channel->private_keys)
return FALSE;
{
SilcChannelPrivateKey entry;
+ assert(client && channel);
+
if (!channel->private_keys)
return FALSE;
SilcChannelPrivateKey *keys = NULL, entry;
SilcUInt32 count = 0;
+ assert(client && channel);
+
if (!channel->private_keys)
return NULL;
SilcChannelEntry channel,
SilcChannelPrivateKey key)
{
+ assert(client && channel);
channel->curr_key = key;
}