/*
- payload.c
+ payload.c
- Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+ Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2000 Pekka Riikonen
+ Copyright (C) 2000 - 2002 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
/* $Id$ */
#include "silcincludes.h"
-#include "payload_internal.h"
/* Encodes Key Exchange Start Payload into a SILC Buffer to be sent
to the other end. */
if (!payload)
return SILC_SKE_STATUS_ERROR;
- buf = silc_buffer_alloc(payload->len);
- silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
+ buf = silc_buffer_alloc_size(payload->len);
+ if (!buf)
+ return SILC_SKE_STATUS_OUT_OF_MEMORY;
/* Encode the payload */
ret = silc_buffer_format(buf,
SilcSKEStartPayload *payload;
SilcSKEStatus status = SILC_SKE_STATUS_ERROR;
unsigned char tmp;
- int ret, len, len2;
+ int ret;
SILC_LOG_DEBUG(("Decoding Key Exchange Start 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->cookie_len),
SILC_STR_UI16_NSTRING_ALLOC(&payload->version,
&payload->version_len),
- SILC_STR_UI_SHORT(&payload->ke_grp_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&payload->ke_grp_list,
+ &payload->ke_grp_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&payload->pkcs_alg_list,
+ &payload->pkcs_alg_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&payload->enc_alg_list,
+ &payload->enc_alg_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&payload->hash_alg_list,
+ &payload->hash_alg_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&payload->hmac_alg_list,
+ &payload->hmac_alg_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&payload->comp_alg_list,
+ &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"));
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
- goto err;
- }
-
- if (payload->ke_grp_len < 1) {
- SILC_LOG_DEBUG(("Bad payload length"));
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
- goto err;
- }
-
- len2 = len = 1 + 1 + 2 + payload->cookie_len + 2 + payload->version_len + 2;
- silc_buffer_pull(buffer, len);
-
- /* Parse group list */
- ret = silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&payload->ke_grp_list,
- payload->ke_grp_len),
- SILC_STR_UI_SHORT(&payload->pkcs_alg_len),
- SILC_STR_END);
- if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
- goto err;
- }
-
- if (payload->pkcs_alg_len < 1) {
- SILC_LOG_DEBUG(("Bad payload length"));
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
- goto err;
- }
-
- len2 += len = payload->ke_grp_len + 2;
- silc_buffer_pull(buffer, len);
-
- /* Parse PKCS alg list */
- ret =
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&payload->pkcs_alg_list,
- payload->pkcs_alg_len),
- SILC_STR_UI_SHORT(&payload->enc_alg_len),
- SILC_STR_END);
- if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
- goto err;
- }
-
- if (payload->enc_alg_len < 1) {
- SILC_LOG_DEBUG(("Bad payload length"));
+ SILC_LOG_ERROR(("Garbage after KE Start Payload"));
status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
goto err;
}
- len2 += len = payload->pkcs_alg_len + 2;
- silc_buffer_pull(buffer, len);
-
- /* Parse encryption alg list */
- ret =
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&payload->enc_alg_list,
- payload->enc_alg_len),
- SILC_STR_UI_SHORT(&payload->hash_alg_len),
- SILC_STR_END);
- if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
- goto err;
- }
-
- if (payload->hash_alg_len < 1) {
- SILC_LOG_DEBUG(("Bad payload length"));
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
- goto err;
- }
-
- len2 += len = payload->enc_alg_len + 2;
- silc_buffer_pull(buffer, len);
-
- /* Parse hash alg list */
- ret =
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&payload->hash_alg_list,
- payload->hash_alg_len),
- SILC_STR_UI_SHORT(&payload->hmac_alg_len),
- SILC_STR_END);
- if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
- goto err;
- }
-
- len2 += len = payload->hash_alg_len + 2;
- silc_buffer_pull(buffer, len);
-
- /* Parse HMAC list */
- ret =
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&payload->hmac_alg_list,
- payload->hmac_alg_len),
- SILC_STR_UI_SHORT(&payload->comp_alg_len),
- SILC_STR_END);
- if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
+ /* Check for mandatory fields */
+ if (!payload->cookie || !payload->version_len ||
+ !payload->ke_grp_len || !payload->pkcs_alg_len ||
+ !payload->enc_alg_len || !payload->hash_alg_len ||
+ !payload->hmac_alg_len) {
+ SILC_LOG_ERROR(("KE Start Payload is missing mandatory fields"));
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
- len2 += len = payload->hmac_alg_len + 2;
- silc_buffer_pull(buffer, len);
-
- /* Parse compression alg list */
- if (payload->comp_alg_len) {
- ret =
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&payload->comp_alg_list,
- payload->comp_alg_len),
- SILC_STR_END);
- if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
- goto err;
- }
- }
-
- silc_buffer_push(buffer, len2);
-
/* Return the payload */
*return_payload = payload;
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);
}
}
-/* Encodes Key Exchange 1 Payload into a SILC Buffer to be sent
- to the other end. */
+/* Encodes Key Exchange Payload into a SILC Buffer to be sent to the other
+ end. */
-SilcSKEStatus silc_ske_payload_one_encode(SilcSKE ske,
- SilcSKEOnePayload *payload,
- SilcBuffer *return_buffer)
+SilcSKEStatus silc_ske_payload_ke_encode(SilcSKE ske,
+ SilcSKEKEPayload *payload,
+ SilcBuffer *return_buffer)
{
SilcBuffer buf;
- unsigned char *e_str;
- unsigned int e_len;
+ unsigned char *x_str;
+ SilcUInt32 x_len;
int ret;
- SILC_LOG_DEBUG(("Encoding KE 1 Payload"));
+ SILC_LOG_DEBUG(("Encoding KE Payload"));
if (!payload)
return SILC_SKE_STATUS_ERROR;
- /* Encode the integer into binary data */
- e_str = silc_mp_mp2bin(&payload->e, 0, &e_len);
- if (!e_str)
- return SILC_SKE_STATUS_ERROR;
-
- /* Allocate channel payload buffer. The length of the buffer
- is 2 + e. */
- buf = silc_buffer_alloc(e_len + 2 + payload->pk_len + 2 + 2);
- silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
-
- /* Encode the payload */
- ret = silc_buffer_format(buf,
- SILC_STR_UI_SHORT(payload->pk_len),
- SILC_STR_UI_SHORT(payload->pk_type),
- SILC_STR_UI_XNSTRING(payload->pk_data,
- payload->pk_len),
- SILC_STR_UI_SHORT(e_len),
- SILC_STR_UI_XNSTRING(e_str, e_len),
- SILC_STR_END);
- if (ret == -1) {
- memset(e_str, 'F', e_len);
- silc_free(e_str);
- silc_buffer_free(buf);
+ 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;
}
- /* Return encoded buffer */
- *return_buffer = buf;
-
- memset(e_str, 'F', e_len);
- silc_free(e_str);
-
- return SILC_SKE_STATUS_OK;
-}
-
-/* Parses the Key Exchange 1 Payload. Parsed data is returned
- to allocated payload structure. */
-
-SilcSKEStatus silc_ske_payload_one_decode(SilcSKE ske,
- SilcBuffer buffer,
- SilcSKEOnePayload **return_payload)
-{
- SilcSKEOnePayload *payload;
- SilcSKEStatus status = SILC_SKE_STATUS_ERROR;
- unsigned char *e;
- unsigned short e_len;
- int ret;
-
- SILC_LOG_DEBUG(("Decoding Key Exchange 1 Payload"));
-
- SILC_LOG_HEXDUMP(("KE 1 Payload"), buffer->data, buffer->len);
-
- payload = silc_calloc(1, sizeof(*payload));
-
- /* Parse start of the payload */
- ret = silc_buffer_unformat(buffer,
- SILC_STR_UI_SHORT(&payload->pk_len),
- SILC_STR_UI_SHORT(&payload->pk_type),
- SILC_STR_END);
- if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
- goto err;
- }
-
- if (payload->pk_len < 5) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD;
- goto err;
- }
-
- /* Parse public key data */
- silc_buffer_pull(buffer, 2 + 2);
- ret = silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&payload->pk_data,
- payload->pk_len),
- SILC_STR_UI16_NSTRING_ALLOC(&e, &e_len),
- SILC_STR_END);
- if (ret == -1) {
- status = SILC_SKE_STATUS_ERROR;
- goto err;
- }
-
- if (e_len < 3) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD;
- goto err;
- }
-
- silc_buffer_push(buffer, 2 + 2);
-
- if (payload->pk_len + 2 + 2 + 2 + e_len != buffer->len) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD;
- goto err;
- }
-
- /* Decode the HEX string to integer */
- silc_mp_init(&payload->e);
- silc_mp_bin2mp(e, e_len, &payload->e);
- memset(e, 0, sizeof(e_len));
- silc_free(e);
-
- /* Return the payload */
- *return_payload = payload;
-
- return SILC_SKE_STATUS_OK;
-
- err:
- silc_free(payload);
- ske->status = status;
- return status;
-}
-
-/* Free's KE1 Payload */
-
-void silc_ske_payload_one_free(SilcSKEOnePayload *payload)
-{
- if (payload) {
- if (payload->pk_data)
- silc_free(payload->pk_data);
- silc_free(payload);
- }
-}
-
-/* Encodes Key Exchange 2 Payload into a SILC Buffer to be sent
- to the other end. */
-
-SilcSKEStatus silc_ske_payload_two_encode(SilcSKE ske,
- SilcSKETwoPayload *payload,
- SilcBuffer *return_buffer)
-{
- SilcBuffer buf;
- unsigned char *f_str;
- unsigned int f_len;
- unsigned int len;
- int ret;
-
- SILC_LOG_DEBUG(("Encoding KE 2 Payload"));
-
- if (!payload)
- return SILC_SKE_STATUS_ERROR;
-
- /* Encode the integer into HEX string */
- f_str = silc_mp_mp2bin(&payload->f, 0, &f_len);
+ /* Encode the integer into binary data */
+ x_str = silc_mp_mp2bin(&payload->x, 0, &x_len);
/* Allocate channel payload buffer. The length of the buffer
- is 2 + 2 + public key + 2 + f + 2 + signature. */
- len = payload->pk_len + 2 + 2 + f_len + 2 + payload->sign_len + 2;
- buf = silc_buffer_alloc(len);
- silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
+ is 4 + public key + 2 + x + 2 + signature. */
+ buf = silc_buffer_alloc_size(4 + payload->pk_len + 2 + x_len +
+ 2 + payload->sign_len);
+ if (!buf)
+ return SILC_SKE_STATUS_OUT_OF_MEMORY;
/* Encode the payload */
ret = silc_buffer_format(buf,
SILC_STR_UI_SHORT(payload->pk_type),
SILC_STR_UI_XNSTRING(payload->pk_data,
payload->pk_len),
- SILC_STR_UI_SHORT(f_len),
- SILC_STR_UI_XNSTRING(f_str, f_len),
+ SILC_STR_UI_SHORT(x_len),
+ SILC_STR_UI_XNSTRING(x_str, x_len),
SILC_STR_UI_SHORT(payload->sign_len),
SILC_STR_UI_XNSTRING(payload->sign_data,
payload->sign_len),
SILC_STR_END);
if (ret == -1) {
- memset(f_str, 'F', f_len);
- silc_free(f_str);
+ memset(x_str, 'F', x_len);
+ silc_free(x_str);
silc_buffer_free(buf);
return SILC_SKE_STATUS_ERROR;
}
/* Return encoded buffer */
*return_buffer = buf;
- memset(f_str, 'F', f_len);
- silc_free(f_str);
+ SILC_LOG_HEXDUMP(("KE Payload"), buf->data, buf->len);
+
+ memset(x_str, 'F', x_len);
+ silc_free(x_str);
return SILC_SKE_STATUS_OK;
}
-/* Parses the Key Exchange 2 Payload. Parsed data is returned
- to allocated payload structure. */
+/* Parses the Key Exchange Payload. Parsed data is returned to allocated
+ payload structure. */
-SilcSKEStatus silc_ske_payload_two_decode(SilcSKE ske,
- SilcBuffer buffer,
- SilcSKETwoPayload **return_payload)
+SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske,
+ SilcBuffer buffer,
+ SilcSKEKEPayload **return_payload)
{
SilcSKEStatus status = SILC_SKE_STATUS_ERROR;
- SilcSKETwoPayload *payload;
- unsigned char *f;
- unsigned short f_len;
- unsigned int tot_len = 0, len2;
+ SilcSKEKEPayload *payload;
+ unsigned char *x = NULL;
+ SilcUInt16 x_len;
+ SilcUInt32 tot_len = 0, len2;
int ret;
- SILC_LOG_DEBUG(("Decoding Key Exchange 2 Payload"));
+ SILC_LOG_DEBUG(("Decoding Key Exchange Payload"));
- SILC_LOG_HEXDUMP(("KE 2 Payload"), buffer->data, buffer->len);
+ 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) || !payload->pk_len)) {
+ SILC_LOG_ERROR(("Malformed public key in KE payload"));
status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
ret = silc_buffer_unformat(buffer,
SILC_STR_UI_XNSTRING_ALLOC(&payload->pk_data,
payload->pk_len),
- SILC_STR_UI16_NSTRING_ALLOC(&f, &f_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&x, &x_len),
SILC_STR_UI16_NSTRING_ALLOC(&payload->sign_data,
&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 += f_len + 2;
+ tot_len += x_len + 2;
tot_len += payload->sign_len + 2;
- if (f_len < 3) {
+ if (x_len < 16) {
+ SILC_LOG_ERROR(("Too short DH value in KE Payload"));
status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
- if (payload->sign_len < 3) {
+ if (ske->start_payload &&
+ (ske->start_payload->flags & SILC_SKE_SP_FLAG_MUTUAL) &&
+ (payload->sign_len < 3 || !payload->sign_data)) {
+ 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;
}
- /* Decode the HEX string to integer */
- silc_mp_init(&payload->f);
- silc_mp_bin2mp(f, f_len, &payload->f);
- memset(f, 0, sizeof(f_len));
- silc_free(f);
+ /* Decode the binary data to integer */
+ silc_mp_init(&payload->x);
+ silc_mp_bin2mp(x, x_len, &payload->x);
+ memset(x, 0, sizeof(x_len));
+ silc_free(x);
/* Return the payload */
*return_payload = payload;
return SILC_SKE_STATUS_OK;
err:
- if (payload->pk_data)
- silc_free(payload->pk_data);
- if (payload->sign_data)
- silc_free(payload->sign_data);
+ silc_free(payload->pk_data);
+ silc_free(payload->sign_data);
+ silc_free(x);
silc_free(payload);
ske->status = status;
return status;
}
-/* Free's KE2 Payload */
+/* Free's KE Payload */
-void silc_ske_payload_two_free(SilcSKETwoPayload *payload)
+void silc_ske_payload_ke_free(SilcSKEKEPayload *payload)
{
if (payload) {
- if (payload->pk_data)
- silc_free(payload->pk_data);
- 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);
}
}
projects / silc.git / blobdiff