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
struct SilcIDPayloadStruct {
SilcIdType type;
- uint16 len;
+ SilcUInt16 len;
unsigned char *id;
};
/* Parses buffer and return ID payload into payload structure */
SilcIDPayload silc_id_payload_parse(const unsigned char *payload,
- uint32 payload_len)
+ SilcUInt32 payload_len)
{
SilcBufferStruct buffer;
- SilcIDPayload new;
+ SilcIDPayload newp;
int ret;
- SILC_LOG_DEBUG(("Parsing ID payload"));
-
silc_buffer_set(&buffer, (unsigned char *)payload, payload_len);
- new = silc_calloc(1, sizeof(*new));
+ newp = silc_calloc(1, sizeof(*newp));
+ if (!newp)
+ return NULL;
ret = silc_buffer_unformat(&buffer,
- SILC_STR_UI_SHORT(&new->type),
- SILC_STR_UI_SHORT(&new->len),
+ SILC_STR_UI_SHORT(&newp->type),
+ SILC_STR_UI_SHORT(&newp->len),
SILC_STR_END);
if (ret == -1)
goto err;
+ if (newp->type > SILC_ID_CHANNEL)
+ goto err;
+
silc_buffer_pull(&buffer, 4);
- if (new->len > buffer.len)
+ if (newp->len > buffer.len || newp->len > SILC_PACKET_MAX_ID_LEN)
goto err;
ret = silc_buffer_unformat(&buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&new->id, new->len),
+ SILC_STR_UI_XNSTRING_ALLOC(&newp->id, newp->len),
SILC_STR_END);
if (ret == -1)
goto err;
silc_buffer_push(&buffer, 4);
- return new;
+ return newp;
err:
- silc_free(new);
+ SILC_LOG_DEBUG(("Error parsing ID payload"));
+ silc_free(newp);
return NULL;
}
/* Return the ID directly from the raw payload data. */
-void *silc_id_payload_parse_id(const unsigned char *data, uint32 len)
+void *silc_id_payload_parse_id(const unsigned char *data, SilcUInt32 len,
+ SilcIdType *ret_type)
{
SilcBufferStruct buffer;
SilcIdType type;
- uint16 idlen;
- unsigned char *id_data = NULL;
+ SilcUInt16 idlen;
+ unsigned char *id_data;
int ret;
void *id;
if (ret == -1)
goto err;
+ if (type > SILC_ID_CHANNEL)
+ goto err;
+
silc_buffer_pull(&buffer, 4);
- if (idlen > buffer.len)
+ if (idlen > buffer.len || idlen > SILC_PACKET_MAX_ID_LEN)
goto err;
ret = silc_buffer_unformat(&buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&id_data, idlen),
+ SILC_STR_UI_XNSTRING(&id_data, idlen),
SILC_STR_END);
if (ret == -1)
goto err;
id = silc_id_str2id(id_data, idlen, type);
- silc_free(id_data);
+
+ if (ret_type)
+ *ret_type = type;
+
return id;
err:
+ SILC_LOG_DEBUG(("Error parsing ID payload"));
return NULL;
}
{
SilcBuffer buffer;
unsigned char *id_data;
- uint32 len;
+ SilcUInt32 len;
id_data = silc_id_id2str(id, type);
len = silc_id_get_len(id, type);
}
SilcBuffer silc_id_payload_encode_data(const unsigned char *id,
- uint32 id_len, SilcIdType type)
+ SilcUInt32 id_len, SilcIdType type)
{
SilcBuffer buffer;
- SILC_LOG_DEBUG(("Encoding %s ID payload",
- type == SILC_ID_CLIENT ? "Client" :
- type == SILC_ID_SERVER ? "Server" : "Channel"));
-
- buffer = silc_buffer_alloc(4 + id_len);
- silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
+ buffer = silc_buffer_alloc_size(4 + id_len);
+ if (!buffer)
+ return NULL;
silc_buffer_format(buffer,
SILC_STR_UI_SHORT(type),
SILC_STR_UI_SHORT(id_len),
/* Get length of ID */
-uint32 silc_id_payload_get_len(SilcIDPayload payload)
+SilcUInt32 silc_id_payload_get_len(SilcIDPayload payload)
{
return payload ? payload->len : 0;
}
SilcServerID *server_id;
SilcClientID *client_id;
SilcChannelID *channel_id;
- uint32 id_len = silc_id_get_len(id, type);
+ SilcUInt32 id_len = silc_id_get_len(id, type);
+
+ if (id_len > SILC_PACKET_MAX_ID_LEN)
+ return NULL;
switch(type) {
case SILC_ID_SERVER:
server_id = (SilcServerID *)id;
ret_id = silc_calloc(id_len, sizeof(unsigned char));
+ if (!ret_id)
+ return NULL;
memcpy(ret_id, server_id->ip.data, server_id->ip.data_len);
- SILC_PUT16_MSB(server_id->port, &ret_id[4]);
- SILC_PUT16_MSB(server_id->rnd, &ret_id[6]);
+ SILC_PUT16_MSB(server_id->port, &ret_id[server_id->ip.data_len]);
+ SILC_PUT16_MSB(server_id->rnd, &ret_id[server_id->ip.data_len + 2]);
return ret_id;
break;
case SILC_ID_CLIENT:
client_id = (SilcClientID *)id;
ret_id = silc_calloc(id_len, sizeof(unsigned char));
+ if (!ret_id)
+ return NULL;
memcpy(ret_id, client_id->ip.data, client_id->ip.data_len);
- ret_id[4] = client_id->rnd;
- memcpy(&ret_id[5], client_id->hash, CLIENTID_HASH_LEN);
+ ret_id[client_id->ip.data_len] = client_id->rnd;
+ memcpy(&ret_id[client_id->ip.data_len + 1], client_id->hash,
+ CLIENTID_HASH_LEN);
return ret_id;
break;
case SILC_ID_CHANNEL:
channel_id = (SilcChannelID *)id;
ret_id = silc_calloc(id_len, sizeof(unsigned char));
+ if (!ret_id)
+ return NULL;
memcpy(ret_id, channel_id->ip.data, channel_id->ip.data_len);
- SILC_PUT16_MSB(channel_id->port, &ret_id[4]);
- SILC_PUT16_MSB(channel_id->rnd, &ret_id[6]);
+ SILC_PUT16_MSB(channel_id->port, &ret_id[channel_id->ip.data_len]);
+ SILC_PUT16_MSB(channel_id->rnd, &ret_id[channel_id->ip.data_len + 2]);
return ret_id;
break;
}
/* Converts string to a ID */
-void *silc_id_str2id(const unsigned char *id, uint32 id_len, SilcIdType type)
+void *silc_id_str2id(const unsigned char *id, SilcUInt32 id_len,
+ SilcIdType type)
{
+ if (id_len > SILC_PACKET_MAX_ID_LEN)
+ return NULL;
switch(type) {
case SILC_ID_SERVER:
return NULL;
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[4]);
- SILC_GET16_MSB(server_id->rnd, &id[6]);
+ 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;
}
break;
return NULL;
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[4];
- memcpy(client_id->hash, &id[5], CLIENTID_HASH_LEN);
+ client_id->rnd = id[client_id->ip.data_len];
+ memcpy(client_id->hash, &id[client_id->ip.data_len + 1],
+ CLIENTID_HASH_LEN);
return client_id;
}
break;
return NULL;
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[4]);
- SILC_GET16_MSB(channel_id->rnd, &id[6]);
+ 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;
}
break;
/* Returns length of the ID */
-uint32 silc_id_get_len(const void *id, SilcIdType type)
+SilcUInt32 silc_id_get_len(const void *id, SilcIdType type)
{
switch(type) {
case SILC_ID_SERVER:
projects / silc.git / blobdiff