payload.c
- Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+ Author: Pekka Riikonen <priikone@silcnet.org>
Copyright (C) 2000 - 2001 Pekka Riikonen
/* $Id$ */
#include "silcincludes.h"
-#include "payload_internal.h"
/* Encodes Key Exchange Start Payload into a SILC Buffer to be sent
to the other end. */
return SILC_SKE_STATUS_ERROR;
buf = silc_buffer_alloc(payload->len);
+ if (!buf)
+ return SILC_SKE_STATUS_OUT_OF_MEMORY;
silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
/* Encode the payload */
SILC_LOG_HEXDUMP(("KE Start Payload"), buffer->data, buffer->len);
payload = silc_calloc(1, sizeof(*payload));
+ if (!payload)
+ return SILC_SKE_STATUS_OUT_OF_MEMORY;
payload->cookie_len = SILC_SKE_COOKIE_LEN;
/* Parse start of the payload */
&payload->comp_alg_len),
SILC_STR_END);
if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
+ SILC_LOG_ERROR(("Malformed KE Start Payload"));
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
if (tmp != 0) {
SILC_LOG_DEBUG(("Bad reserved field"));
+ SILC_LOG_ERROR(("Bad RESERVED field in KE Start Payload"));
status = SILC_SKE_STATUS_BAD_RESERVED_FIELD;
goto err;
}
if (payload->len != buffer->len) {
- SILC_LOG_DEBUG(("Bad payload length"));
+ SILC_LOG_ERROR(("Garbage after KE Start Payload"));
status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
goto err;
}
void silc_ske_payload_start_free(SilcSKEStartPayload *payload)
{
if (payload) {
- if (payload->cookie)
- silc_free(payload->cookie);
- if (payload->version)
- silc_free(payload->version);
- if (payload->ke_grp_list)
- silc_free(payload->ke_grp_list);
- if (payload->pkcs_alg_list)
- silc_free(payload->pkcs_alg_list);
- if (payload->enc_alg_list)
- silc_free(payload->enc_alg_list);
- if (payload->hash_alg_list)
- silc_free(payload->hash_alg_list);
- if (payload->hmac_alg_list)
- silc_free(payload->hmac_alg_list);
- if (payload->comp_alg_list)
- silc_free(payload->comp_alg_list);
+ silc_free(payload->cookie);
+ silc_free(payload->version);
+ silc_free(payload->ke_grp_list);
+ silc_free(payload->pkcs_alg_list);
+ silc_free(payload->enc_alg_list);
+ silc_free(payload->hash_alg_list);
+ silc_free(payload->hmac_alg_list);
+ silc_free(payload->comp_alg_list);
silc_free(payload);
}
}
{
SilcBuffer buf;
unsigned char *x_str;
- uint32 x_len;
+ SilcUInt32 x_len;
int ret;
SILC_LOG_DEBUG(("Encoding KE Payload"));
if (!payload)
return SILC_SKE_STATUS_ERROR;
- if (ske->start_payload->flags & SILC_SKE_SP_FLAG_MUTUAL &&
+ if (ske->start_payload &&
+ ske->start_payload->flags & SILC_SKE_SP_FLAG_MUTUAL &&
!payload->sign_data) {
SILC_LOG_DEBUG(("Signature data is missing"));
return SILC_SKE_STATUS_ERROR;
is 4 + public key + 2 + x + 2 + signature. */
buf = silc_buffer_alloc(4 + payload->pk_len + 2 + x_len +
2 + payload->sign_len);
+ if (!buf)
+ return SILC_SKE_STATUS_OUT_OF_MEMORY;
silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
/* Encode the payload */
SilcSKEStatus status = SILC_SKE_STATUS_ERROR;
SilcSKEKEPayload *payload;
unsigned char *x = NULL;
- uint16 x_len;
- uint32 tot_len = 0, len2;
+ SilcUInt16 x_len;
+ SilcUInt32 tot_len = 0, len2;
int ret;
SILC_LOG_DEBUG(("Decoding Key Exchange Payload"));
SILC_LOG_HEXDUMP(("KE Payload"), buffer->data, buffer->len);
payload = silc_calloc(1, sizeof(*payload));
+ if (!payload)
+ return SILC_SKE_STATUS_OUT_OF_MEMORY;
len2 = buffer->len;
SILC_STR_UI_SHORT(&payload->pk_type),
SILC_STR_END);
if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
+ SILC_LOG_ERROR(("Cannot decode public key from KE payload"));
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
- if (payload->pk_len < 5) {
+ if (ske->start_payload &&
+ (payload->pk_type < SILC_SKE_PK_TYPE_SILC ||
+ payload->pk_type > SILC_SKE_PK_TYPE_SPKI)) {
+ SILC_LOG_ERROR(("Malformed public key in KE payload"));
status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
&payload->sign_len),
SILC_STR_END);
if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
+ SILC_LOG_ERROR(("Malformed KE Payload"));
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
tot_len += payload->sign_len + 2;
if (x_len < 3) {
+ SILC_LOG_ERROR(("Too short signature in KE Payload"));
status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
- if ((ske->start_payload->flags & SILC_SKE_SP_FLAG_MUTUAL) &&
+ if (ske->start_payload &&
+ (ske->start_payload->flags & SILC_SKE_SP_FLAG_MUTUAL) &&
(payload->sign_len < 3 || !payload->sign_data)) {
- SILC_LOG_DEBUG(("The signature data is missing - both parties are "
+ SILC_LOG_ERROR(("The signature data is missing - both parties are "
"required to do authentication"));
status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
if (tot_len != len2) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD;
+ SILC_LOG_ERROR(("Garbage after KE payload"));
+ status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
goto err;
}
return SILC_SKE_STATUS_OK;
err:
- if (payload->pk_data)
- silc_free(payload->pk_data);
- if (payload->sign_data)
- silc_free(payload->sign_data);
- if (x)
- silc_free(x);
+ silc_free(payload->pk_data);
+ silc_free(payload->sign_data);
+ silc_free(x);
silc_free(payload);
ske->status = status;
return status;
void silc_ske_payload_ke_free(SilcSKEKEPayload *payload)
{
if (payload) {
- if (payload->pk_data)
- silc_free(payload->pk_data);
- silc_mp_clear(&payload->x);
- if (payload->sign_data)
- silc_free(payload->sign_data);
+ silc_free(payload->pk_data);
+ silc_mp_uninit(&payload->x);
+ silc_free(payload->sign_data);
silc_free(payload);
}
}