Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
- Copyright (C) 1997 - 2000 Pekka Riikonen
+ Copyright (C) 1997 - 2001 Pekka Riikonen
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
/* Channel Message Payload structure. Contents of this structure is parsed
from SILC packets. */
struct SilcChannelPayloadStruct {
- unsigned short name_len;
+ uint16 name_len;
unsigned char *channel_name;
- unsigned short id_len;
+ uint16 id_len;
unsigned char *channel_id;
- unsigned int mode;
+ uint32 mode;
};
/* Parses channel payload returning new channel payload structure. */
/* Encode new channel payload and returns it as buffer. */
SilcBuffer silc_channel_payload_encode(unsigned char *channel_name,
- unsigned short channel_name_len,
+ uint16 channel_name_len,
unsigned char *channel_id,
- unsigned int channel_id_len,
- unsigned int mode)
+ uint32 channel_id_len,
+ uint32 mode)
{
SilcBuffer buffer;
/* Return the channel name */
unsigned char *silc_channel_get_name(SilcChannelPayload payload,
- unsigned int *channel_name_len)
+ uint32 *channel_name_len)
{
if (channel_name_len)
*channel_name_len = payload->name_len;
/* Return the channel ID */
unsigned char *silc_channel_get_id(SilcChannelPayload payload,
- unsigned int *channel_id_len)
+ uint32 *channel_id_len)
{
if (channel_id_len)
*channel_id_len = payload->id_len;
channel or perhaps the mode of the client on the channel. The protocol
dictates what the usage of the mode is in different circumstances. */
-unsigned int silc_channel_get_mode(SilcChannelPayload payload)
+uint32 silc_channel_get_mode(SilcChannelPayload payload)
{
return payload->mode;
}
/* Channel Message Payload structure. Contents of this structure is parsed
from SILC packets. */
struct SilcChannelMessagePayloadStruct {
- unsigned short data_len;
+ uint16 flags;
+ uint16 data_len;
unsigned char *data;
unsigned char *mac;
unsigned char *iv;
SilcCipher cipher,
SilcHmac hmac)
{
- unsigned int iv_len, mac_len;
+ uint32 iv_len, mac_len;
unsigned char *end, *mac, mac2[32];
/* Decrypt the channel message. First push the IV out of the packet.
{
SilcChannelMessagePayload new;
int ret;
- unsigned int iv_len, mac_len;
+ uint32 iv_len, mac_len;
SILC_LOG_DEBUG(("Parsing channel message payload"));
/* Parse the Channel Message Payload. Ignore the padding. */
ret = silc_buffer_unformat(buffer,
+ SILC_STR_UI_SHORT(&new->flags),
SILC_STR_UI16_NSTRING_ALLOC(&new->data,
&new->data_len),
SILC_STR_UI16_NSTRING(NULL, NULL),
encrypted separately from other parts of the packet padding must
be applied to the payload. */
-SilcBuffer silc_channel_message_payload_encode(unsigned short data_len,
+SilcBuffer silc_channel_message_payload_encode(uint16 flags,
+ uint16 data_len,
unsigned char *data,
- unsigned short iv_len,
+ uint16 iv_len,
unsigned char *iv,
SilcCipher cipher,
- SilcHmac hmac,
- SilcRng rng)
+ SilcHmac hmac)
{
int i;
SilcBuffer buffer;
- unsigned int len, pad_len, mac_len;
+ uint32 len, pad_len, mac_len;
unsigned char pad[SILC_PACKET_MAX_PADLEN];
unsigned char mac[32];
/* Calculate length of padding. IV is not included into the calculation
since it is not encrypted. */
mac_len = silc_hmac_len(hmac);
- len = 4 + data_len + mac_len;
+ len = 6 + data_len + mac_len;
pad_len = SILC_PACKET_PADLEN((len + 2));
/* Allocate channel payload buffer */
buffer = silc_buffer_alloc(len);
/* Generate padding */
- for (i = 0; i < pad_len; i++) pad[i] = silc_rng_get_byte(rng);
+ for (i = 0; i < pad_len; i++) pad[i] = silc_rng_global_get_byte();
/* Encode the Channel Message Payload */
- silc_buffer_pull_tail(buffer, 4 + data_len + pad_len);
+ silc_buffer_pull_tail(buffer, 6 + data_len + pad_len);
silc_buffer_format(buffer,
+ SILC_STR_UI_SHORT(flags),
SILC_STR_UI_SHORT(data_len),
SILC_STR_UI_XNSTRING(data, data_len),
SILC_STR_UI_SHORT(pad_len),
/* Put rest of the data to the payload */
silc_buffer_pull_tail(buffer, mac_len + iv_len);
- silc_buffer_pull(buffer, 4 + data_len + pad_len);
+ silc_buffer_pull(buffer, 6 + data_len + pad_len);
silc_buffer_format(buffer,
SILC_STR_UI_XNSTRING(mac, mac_len),
SILC_STR_UI_XNSTRING(iv, iv_len),
SILC_STR_END);
- silc_buffer_push(buffer, 4 + data_len + pad_len);
+ silc_buffer_push(buffer, 6 + data_len + pad_len);
/* Encrypt payload of the packet. This is encrypted with the channel key. */
silc_cipher_encrypt(cipher, buffer->data, buffer->data,
silc_free(payload);
}
+/* Return flags */
+
+uint16
+silc_channel_message_get_flags(SilcChannelMessagePayload payload)
+{
+ return payload->flags;
+}
+
/* Return data */
unsigned char *silc_channel_message_get_data(SilcChannelMessagePayload payload,
- unsigned int *data_len)
+ uint32 *data_len)
{
if (data_len)
*data_len = payload->data_len;
/* Channel Key Payload structrue. Channel keys are parsed from SILC
packets into this structure. */
struct SilcChannelKeyPayloadStruct {
- unsigned short id_len;
+ uint16 id_len;
unsigned char *id;
- unsigned short cipher_len;
+ uint16 cipher_len;
unsigned char *cipher;
- unsigned short key_len;
+ uint16 key_len;
unsigned char *key;
};
/* Encodes channel key payload into a buffer and returns it. This is used
to add channel key payload into a packet. */
-SilcBuffer silc_channel_key_payload_encode(unsigned short id_len,
+SilcBuffer silc_channel_key_payload_encode(uint16 id_len,
unsigned char *id,
- unsigned short cipher_len,
+ uint16 cipher_len,
unsigned char *cipher,
- unsigned short key_len,
+ uint16 key_len,
unsigned char *key)
{
SilcBuffer buffer;
- unsigned int len;
+ uint32 len;
SILC_LOG_DEBUG(("Encoding channel key payload"));
void silc_channel_key_payload_free(SilcChannelKeyPayload payload)
{
if (payload) {
- if (payload->id)
- silc_free(payload->id);
- if (payload->cipher)
- silc_free(payload->cipher);
+ silc_free(payload->id);
+ silc_free(payload->cipher);
if (payload->key) {
memset(payload->key, 0, payload->key_len);
silc_free(payload->key);
/* Return ID */
unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload,
- unsigned int *id_len)
+ uint32 *id_len)
{
if (id_len)
*id_len = payload->id_len;
/* Return cipher name */
unsigned char *silc_channel_key_get_cipher(SilcChannelKeyPayload payload,
- unsigned int *cipher_len)
+ uint32 *cipher_len)
{
if (cipher_len)
*cipher_len = payload->cipher_len;
/* Return key */
unsigned char *silc_channel_key_get_key(SilcChannelKeyPayload payload,
- unsigned int *key_len)
+ uint32 *key_len)
{
if (key_len)
*key_len = payload->key_len;
projects / silc.git / blobdiff