updates.

[silc.git] / lib / silccore / silcchannel.c

diff --git a/lib/silccore/silcchannel.c b/lib/silccore/silcchannel.c
index 1dc0f438b6250116926a12280e3c88994ff9f8fa..0a3e2dc30b927e50c4be887ba8d7bd7e3776a26c 100644 (file)
--- a/lib/silccore/silcchannel.c
+++ b/lib/silccore/silcchannel.c
@@ -33,11 +33,11 @@
 /* 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. */
@@ -123,10 +123,10 @@ SilcDList silc_channel_payload_parse_list(SilcBuffer buffer)
 /* 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;
 
@@ -147,7 +147,7 @@ SilcBuffer silc_channel_payload_encode(unsigned char *channel_name,
   return buffer;
 }
 
-/* Free's Channel Payload */
+/* Frees Channel Payload */
 
 void silc_channel_payload_free(SilcChannelPayload payload)
 {
@@ -176,7 +176,7 @@ void silc_channel_payload_list_free(SilcDList list)
 /* 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;
@@ -187,7 +187,7 @@ unsigned char *silc_channel_get_name(SilcChannelPayload payload,
 /* 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;
@@ -207,7 +207,7 @@ SilcChannelID *silc_channel_get_id_parse(SilcChannelPayload payload)
    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;
 }
@@ -218,11 +218,13 @@ unsigned int silc_channel_get_mode(SilcChannelPayload payload)
 
 ******************************************************************************/
 
+#define SILC_CHANNEL_MESSAGE_PAD(__payloadlen) (16 - (__payloadlen) % 16)
+
 /* Channel Message Payload structure. Contents of this structure is parsed
    from SILC packets. */
 struct SilcChannelMessagePayloadStruct {
-  unsigned short flags;
-  unsigned short data_len;
+  SilcMessageFlags flags;
+  uint16 data_len;
   unsigned char *data;
   unsigned char *mac;
   unsigned char *iv;
@@ -235,7 +237,7 @@ int silc_channel_message_payload_decrypt(unsigned char *data,
                                         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.
@@ -279,13 +281,13 @@ silc_channel_message_payload_parse(SilcBuffer buffer,
 {
   SilcChannelMessagePayload new;
   int ret;
-  unsigned int iv_len, mac_len;
+  uint32 iv_len, mac_len;
 
   SILC_LOG_DEBUG(("Parsing channel message payload"));
 
   /* Decrypt the payload */
   ret = silc_channel_message_payload_decrypt(buffer->data, buffer->len,
-                                    cipher, hmac);
+                                            cipher, hmac);
   if (ret == FALSE)
     return NULL;
 
@@ -307,7 +309,7 @@ silc_channel_message_payload_parse(SilcBuffer buffer,
     goto err;
 
   if (new->data_len < 1 || new->data_len > buffer->len) {
-    SILC_LOG_ERROR(("Incorrect channel messaeg payload in packet, "
+    SILC_LOG_ERROR(("Incorrect channel message payload in packet, "
                    "packet dropped"));
     goto err;
   }
@@ -324,18 +326,18 @@ silc_channel_message_payload_parse(SilcBuffer buffer,
    encrypted separately from other parts of the packet padding must
    be applied to the payload. */
 
-SilcBuffer silc_channel_message_payload_encode(unsigned short flags,
-                                              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)
 {
   int i;
   SilcBuffer buffer;
-  unsigned int len, pad_len, mac_len;
-  unsigned char pad[SILC_PACKET_MAX_PADLEN];
+  uint32 len, pad_len, mac_len;
+  unsigned char pad[16];
   unsigned char mac[32];
 
   SILC_LOG_DEBUG(("Encoding channel message payload"));
@@ -344,7 +346,7 @@ SilcBuffer silc_channel_message_payload_encode(unsigned short flags,
      since it is not encrypted. */
   mac_len = silc_hmac_len(hmac);
   len = 6 + data_len + mac_len;
-  pad_len = SILC_PACKET_PADLEN((len + 2));
+  pad_len = SILC_CHANNEL_MESSAGE_PAD(len);
 
   /* Allocate channel payload buffer */
   len += pad_len + iv_len;
@@ -398,7 +400,7 @@ void silc_channel_message_payload_free(SilcChannelMessagePayload payload)
 
 /* Return flags */
 
-unsigned short 
+SilcMessageFlags
 silc_channel_message_get_flags(SilcChannelMessagePayload payload)
 {
   return payload->flags;
@@ -407,7 +409,7 @@ silc_channel_message_get_flags(SilcChannelMessagePayload payload)
 /* 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;
@@ -438,11 +440,11 @@ unsigned char *silc_channel_message_get_iv(SilcChannelMessagePayload payload)
 /* 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;
 };
 
@@ -489,15 +491,15 @@ SilcChannelKeyPayload silc_channel_key_payload_parse(SilcBuffer buffer)
 /* 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"));
 
@@ -521,7 +523,7 @@ SilcBuffer silc_channel_key_payload_encode(unsigned short id_len,
   return buffer;
 }
 
-/* Free's Channel Key Payload */
+/* Frees Channel Key Payload */
 
 void silc_channel_key_payload_free(SilcChannelKeyPayload payload)
 {
@@ -539,7 +541,7 @@ void silc_channel_key_payload_free(SilcChannelKeyPayload payload)
 /* 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;
@@ -550,7 +552,7 @@ unsigned char *silc_channel_key_get_id(SilcChannelKeyPayload payload,
 /* 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;
@@ -561,7 +563,7 @@ unsigned char *silc_channel_key_get_cipher(SilcChannelKeyPayload payload,
 /* 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;