X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient_channel.c;h=68983d59c6f6692dc5adf3837deca7c95632cd1f;hp=67cde554841011c0c3919261e60777c4189fa0ad;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=3cf38201f9ffaad2da53757ed48a5546e1d03636 diff --git a/lib/silcclient/client_channel.c b/lib/silcclient/client_channel.c index 67cde554..68983d59 100644 --- a/lib/silcclient/client_channel.c +++ b/lib/silcclient/client_channel.c @@ -109,7 +109,8 @@ void silc_client_send_channel_message(SilcClient client, /* Encode the message payload. This also encrypts the message payload. */ payload = silc_message_payload_encode(flags, data, data_len, TRUE, FALSE, - cipher, hmac, client->rng); + cipher, hmac, client->rng, NULL, + client->private_key, client->sha1hash); /* Get data used in packet header encryption, keys and stuff. */ cipher = conn->internal->send_key; @@ -205,9 +206,9 @@ static void silc_client_channel_message_cb(SilcClient client, /* Pass the message to application */ client->internal->ops->channel_message( - client, conn, clients[0], channel, - silc_message_get_flags(res->payload), - message, message_len); + client, conn, clients[0], channel, res->payload, + silc_message_get_flags(res->payload), + message, message_len); } out: @@ -316,9 +317,9 @@ void silc_client_channel_message(SilcClient client, /* Pass the message to application */ client->internal->ops->channel_message( - client, conn, client_entry, channel, - silc_message_get_flags(payload), - message, message_len); + client, conn, client_entry, channel, payload, + silc_message_get_flags(payload), + message, message_len); out: silc_free(id); @@ -511,7 +512,7 @@ bool silc_client_add_channel_private_key(SilcClient client, /* Produce the key material */ keymat = silc_calloc(1, sizeof(*keymat)); if (silc_ske_process_key_material_data(key, key_len, 16, 256, 16, - client->md5hash, keymat) + client->sha1hash, keymat) != SILC_SKE_STATUS_OK) return FALSE;