Initial code commit for Toolkit 1.1.

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

diff --git a/lib/silccore/silcid.c b/lib/silccore/silcid.c
index 6a7fb8f2c72c38c20902cd95f137045b61b32c00..1d6b59b9fafdbe09e8f7885b0c606e7d0705cf6e 100644 (file)
--- a/lib/silccore/silcid.c
+++ b/lib/silccore/silcid.c
@@ -2,15 +2,14 @@
 
   id.c
 
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2001 Pekka Riikonen
+  Copyright (C) 1997 - 2005 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
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -48,8 +47,6 @@ SilcIDPayload silc_id_payload_parse(const unsigned char *payload,
   SilcIDPayload newp;
   int ret;
 
-  SILC_LOG_DEBUG(("Parsing ID payload"));
-
   silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
   newp = silc_calloc(1, sizeof(*newp));
   if (!newp)
@@ -62,9 +59,12 @@ SilcIDPayload silc_id_payload_parse(const unsigned char *payload,
   if (ret == -1)
     goto err;
 
+  if (newp->type > SILC_ID_CHANNEL)
+    goto err;
+
   silc_buffer_pull(&buffer, 4);
 
-  if (newp->len > buffer.len || newp->len > SILC_PACKET_MAX_ID_LEN)
+  if (newp->len > silc_buffer_len(&buffer) || newp->len > SILC_PACKET_MAX_ID_LEN)
     goto err;
 
   ret = silc_buffer_unformat(&buffer,
@@ -78,6 +78,7 @@ SilcIDPayload silc_id_payload_parse(const unsigned char *payload,
   return newp;
 
  err:
+  SILC_LOG_DEBUG(("Error parsing ID payload"));
   silc_free(newp);
   return NULL;
 }
@@ -100,18 +101,21 @@ void *silc_id_payload_parse_id(const unsigned char *data, SilcUInt32 len,
                             SILC_STR_UI_SHORT(&idlen),
                             SILC_STR_END);
   if (ret == -1)
-    return NULL;
+    goto err;
+
+  if (type > SILC_ID_CHANNEL)
+    goto err;
 
   silc_buffer_pull(&buffer, 4);
 
-  if (idlen > buffer.len || idlen > SILC_PACKET_MAX_ID_LEN)
-    return NULL;
+  if (idlen > silc_buffer_len(&buffer) || idlen > SILC_PACKET_MAX_ID_LEN)
+    goto err;
 
   ret = silc_buffer_unformat(&buffer,
                             SILC_STR_UI_XNSTRING(&id_data, idlen),
                             SILC_STR_END);
   if (ret == -1)
-    return NULL;
+    goto err;
 
   id = silc_id_str2id(id_data, idlen, type);
 
@@ -119,6 +123,10 @@ void *silc_id_payload_parse_id(const unsigned char *data, SilcUInt32 len,
     *ret_type = type;
 
   return id;
+
+ err:
+  SILC_LOG_DEBUG(("Error parsing ID payload"));
+  return NULL;
 }
 
 /* Encodes ID Payload */
@@ -142,10 +150,6 @@ SilcBuffer silc_id_payload_encode_data(const unsigned char *id,
 {
   SilcBuffer buffer;
 
-  SILC_LOG_DEBUG(("Encoding %s ID payload",
-                 type == SILC_ID_CLIENT ? "Client" :
-                 type == SILC_ID_SERVER ? "Server" : "Channel"));
-
   buffer = silc_buffer_alloc_size(4 + id_len);
   if (!buffer)
     return NULL;
@@ -201,7 +205,8 @@ SilcUInt32 silc_id_payload_get_len(SilcIDPayload payload)
 
 /* Converts ID to string. */
 
-unsigned char *silc_id_id2str(const void *id, SilcIdType type)
+unsigned char *silc_id_id2str(const void *id, SilcIdType type,
+                             SilcUInt32 *ret_id_len)
 {
   unsigned char *ret_id;
   SilcServerID *server_id;
@@ -209,6 +214,12 @@ unsigned char *silc_id_id2str(const void *id, SilcIdType type)
   SilcChannelID *channel_id;
   SilcUInt32 id_len = silc_id_get_len(id, type);
 
+  if (ret_id_len)
+    *ret_id_len = id_len;
+
+  if (id_len > SILC_PACKET_MAX_ID_LEN)
+    return NULL;
+
   switch(type) {
   case SILC_ID_SERVER:
     server_id = (SilcServerID *)id;
@@ -227,7 +238,7 @@ unsigned char *silc_id_id2str(const void *id, SilcIdType type)
       return NULL;
     memcpy(ret_id, client_id->ip.data, client_id->ip.data_len);
     ret_id[client_id->ip.data_len] = client_id->rnd;
-    memcpy(&ret_id[client_id->ip.data_len + 1], client_id->hash, 
+    memcpy(&ret_id[client_id->ip.data_len + 1], client_id->hash,
           CLIENTID_HASH_LEN);
     return ret_id;
     break;
@@ -248,72 +259,65 @@ unsigned char *silc_id_id2str(const void *id, SilcIdType type)
 
 /* Converts string to a ID */
 
-void *silc_id_str2id(const unsigned char *id, SilcUInt32 id_len, 
-                    SilcIdType type)
+bool silc_id_str2id(const unsigned char *id, SilcUInt32 id_len,
+                   SilcIdType type, void *ret_id)
 {
+  if (id_len > SILC_PACKET_MAX_ID_LEN)
+    return FALSE;
 
   switch(type) {
   case SILC_ID_SERVER:
     {
-      SilcServerID *server_id;
+      SilcServerID *server_id = ret_id;
 
       if (id_len != ID_SERVER_LEN_PART + 4 &&
          id_len != ID_SERVER_LEN_PART + 16)
-       return NULL;
+       return FALSE;
 
-      server_id = silc_calloc(1, sizeof(*server_id));
-      if (!server_id)
-       return NULL;
       memcpy(server_id->ip.data, id, (id_len > ID_SERVER_LEN_PART + 4 ?
                                      16 : 4));
       server_id->ip.data_len = (id_len > ID_SERVER_LEN_PART + 4 ? 16 : 4);
       SILC_GET16_MSB(server_id->port, &id[server_id->ip.data_len]);
       SILC_GET16_MSB(server_id->rnd, &id[server_id->ip.data_len + 2]);
-      return server_id;
+      return TRUE;
     }
     break;
   case SILC_ID_CLIENT:
     {
-      SilcClientID *client_id;
+      SilcClientID *client_id = ret_id;
 
       if (id_len != ID_CLIENT_LEN_PART + 4 &&
          id_len != ID_CLIENT_LEN_PART + 16)
-       return NULL;
+       return FALSE;
 
-      client_id = silc_calloc(1, sizeof(*client_id));
-      if (!client_id)
-       return NULL;
       memcpy(client_id->ip.data, id, (id_len > ID_CLIENT_LEN_PART + 4 ?
                                      16 : 4));
       client_id->ip.data_len = (id_len > ID_CLIENT_LEN_PART + 4 ? 16 : 4);
       client_id->rnd = id[client_id->ip.data_len];
-      memcpy(client_id->hash, &id[client_id->ip.data_len + 1], 
+      memcpy(client_id->hash, &id[client_id->ip.data_len + 1],
             CLIENTID_HASH_LEN);
-      return client_id;
+      return TRUE;
     }
     break;
   case SILC_ID_CHANNEL:
     {
-      SilcChannelID *channel_id;
+      SilcChannelID *channel_id = ret_id;
 
       if (id_len != ID_CHANNEL_LEN_PART + 4 &&
          id_len != ID_CHANNEL_LEN_PART + 16)
-       return NULL;
+       return FALSE;
 
-      channel_id = silc_calloc(1, sizeof(*channel_id));
-      if (!channel_id)
-       return NULL;
       memcpy(channel_id->ip.data, id, (id_len > ID_CHANNEL_LEN_PART + 4 ?
                                       16 : 4));
       channel_id->ip.data_len = (id_len > ID_CHANNEL_LEN_PART + 4 ? 16 : 4);
       SILC_GET16_MSB(channel_id->port, &id[channel_id->ip.data_len]);
       SILC_GET16_MSB(channel_id->rnd, &id[channel_id->ip.data_len + 2]);
-      return channel_id;
+      return TRUE;
     }
     break;
   }
 
-  return NULL;
+  return FALSE;
 }
 
 /* Returns length of the ID */