X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcske%2Fpayload.c;h=ad45ea8d74a1d14410310a722affb97e80a36506;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=99457a804669daf43d87bffb7326d82d8fe397cc;hpb=6f3e830b8c25a42ad714a32e60e398bcfc3796f5;p=silc.git diff --git a/lib/silcske/payload.c b/lib/silcske/payload.c index 99457a80..ad45ea8d 100644 --- a/lib/silcske/payload.c +++ b/lib/silcske/payload.c @@ -4,13 +4,12 @@ Author: Pekka Riikonen - Copyright (C) 2000 - 2001 Pekka Riikonen + Copyright (C) 2000 - 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 @@ -19,13 +18,14 @@ */ /* $Id$ */ -#include "silcincludes.h" +#include "silc.h" +#include "silcske_i.h" /* Encodes Key Exchange Start Payload into a SILC Buffer to be sent to the other end. */ SilcSKEStatus silc_ske_payload_start_encode(SilcSKE ske, - SilcSKEStartPayload *payload, + SilcSKEStartPayload payload, SilcBuffer *return_buffer) { SilcBuffer buf; @@ -36,20 +36,19 @@ SilcSKEStatus silc_ske_payload_start_encode(SilcSKE ske, if (!payload) return SILC_SKE_STATUS_ERROR; - buf = silc_buffer_alloc(payload->len); + buf = silc_buffer_alloc_size(payload->len); if (!buf) return SILC_SKE_STATUS_OUT_OF_MEMORY; - silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf)); /* Encode the payload */ ret = silc_buffer_format(buf, SILC_STR_UI_CHAR(0), /* RESERVED field */ SILC_STR_UI_CHAR(payload->flags), SILC_STR_UI_SHORT(payload->len), - SILC_STR_UI_XNSTRING(payload->cookie, + SILC_STR_UI_XNSTRING(payload->cookie, payload->cookie_len), SILC_STR_UI_SHORT(payload->version_len), - SILC_STR_UI_XNSTRING(payload->version, + SILC_STR_UI_XNSTRING(payload->version, payload->version_len), SILC_STR_UI_SHORT(payload->ke_grp_len), SILC_STR_UI_XNSTRING(payload->ke_grp_list, @@ -78,7 +77,7 @@ SilcSKEStatus silc_ske_payload_start_encode(SilcSKE ske, /* Return the encoded buffer */ *return_buffer = buf; - SILC_LOG_HEXDUMP(("KE Start Payload"), buf->data, buf->len); + SILC_LOG_HEXDUMP(("KE Start Payload"), buf->data, silc_buffer_len(buf)); return SILC_SKE_STATUS_OK; } @@ -86,19 +85,20 @@ SilcSKEStatus silc_ske_payload_start_encode(SilcSKE ske, /* Parses the Key Exchange Start Payload. Parsed data is returned to allocated payload structure. */ -SilcSKEStatus +SilcSKEStatus silc_ske_payload_start_decode(SilcSKE ske, SilcBuffer buffer, - SilcSKEStartPayload **return_payload) + SilcSKEStartPayload *return_payload) { - SilcSKEStartPayload *payload; + SilcSKEStartPayload payload; SilcSKEStatus status = SILC_SKE_STATUS_ERROR; unsigned char tmp; int ret; SILC_LOG_DEBUG(("Decoding Key Exchange Start Payload")); - SILC_LOG_HEXDUMP(("KE Start Payload"), buffer->data, buffer->len); + SILC_LOG_HEXDUMP(("KE Start Payload"), buffer->data, + silc_buffer_len(buffer)); payload = silc_calloc(1, sizeof(*payload)); if (!payload) @@ -106,12 +106,12 @@ silc_ske_payload_start_decode(SilcSKE ske, payload->cookie_len = SILC_SKE_COOKIE_LEN; /* Parse start of the payload */ - ret = + ret = silc_buffer_unformat(buffer, SILC_STR_UI_CHAR(&tmp), /* RESERVED Field */ SILC_STR_UI_CHAR(&payload->flags), SILC_STR_UI_SHORT(&payload->len), - SILC_STR_UI_XNSTRING_ALLOC(&payload->cookie, + SILC_STR_UI_XNSTRING_ALLOC(&payload->cookie, payload->cookie_len), SILC_STR_UI16_NSTRING_ALLOC(&payload->version, &payload->version_len), @@ -135,13 +135,12 @@ silc_ske_payload_start_decode(SilcSKE ske, } 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) { + if (payload->len != silc_buffer_len(buffer)) { SILC_LOG_ERROR(("Garbage after KE Start Payload")); status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH; goto err; @@ -171,7 +170,7 @@ silc_ske_payload_start_decode(SilcSKE ske, /* Free's Start Payload */ -void silc_ske_payload_start_free(SilcSKEStartPayload *payload) +void silc_ske_payload_start_free(SilcSKEStartPayload payload) { if (payload) { silc_free(payload->cookie); @@ -190,7 +189,7 @@ void silc_ske_payload_start_free(SilcSKEStartPayload *payload) end. */ SilcSKEStatus silc_ske_payload_ke_encode(SilcSKE ske, - SilcSKEKEPayload *payload, + SilcSKEKEPayload payload, SilcBuffer *return_buffer) { SilcBuffer buf; @@ -203,7 +202,7 @@ SilcSKEStatus silc_ske_payload_ke_encode(SilcSKE ske, if (!payload) return SILC_SKE_STATUS_ERROR; - if (ske->start_payload && + if (ske->start_payload && ske->start_payload->flags & SILC_SKE_SP_FLAG_MUTUAL && !payload->sign_data) { SILC_LOG_DEBUG(("Signature data is missing")); @@ -215,22 +214,21 @@ SilcSKEStatus silc_ske_payload_ke_encode(SilcSKE ske, /* Allocate channel payload buffer. The length of the buffer is 4 + public key + 2 + x + 2 + signature. */ - buf = silc_buffer_alloc(4 + payload->pk_len + 2 + x_len + - 2 + payload->sign_len); + 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; - silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf)); /* Encode the payload */ - ret = silc_buffer_format(buf, + 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, + SILC_STR_UI_XNSTRING(payload->pk_data, payload->pk_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, + SILC_STR_UI_XNSTRING(payload->sign_data, payload->sign_len), SILC_STR_END); if (ret == -1) { @@ -243,7 +241,7 @@ SilcSKEStatus silc_ske_payload_ke_encode(SilcSKE ske, /* Return encoded buffer */ *return_buffer = buf; - SILC_LOG_HEXDUMP(("KE Payload"), buf->data, buf->len); + SILC_LOG_HEXDUMP(("KE Payload"), buf->data, silc_buffer_len(buf)); memset(x_str, 'F', x_len); silc_free(x_str); @@ -256,10 +254,10 @@ SilcSKEStatus silc_ske_payload_ke_encode(SilcSKE ske, SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske, SilcBuffer buffer, - SilcSKEKEPayload **return_payload) + SilcSKEKEPayload *return_payload) { SilcSKEStatus status = SILC_SKE_STATUS_ERROR; - SilcSKEKEPayload *payload; + SilcSKEKEPayload payload; unsigned char *x = NULL; SilcUInt16 x_len; SilcUInt32 tot_len = 0, len2; @@ -267,13 +265,13 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske, SILC_LOG_DEBUG(("Decoding Key Exchange Payload")); - SILC_LOG_HEXDUMP(("KE Payload"), buffer->data, buffer->len); + SILC_LOG_HEXDUMP(("KE Payload"), buffer->data, silc_buffer_len(buffer)); payload = silc_calloc(1, sizeof(*payload)); if (!payload) return SILC_SKE_STATUS_OUT_OF_MEMORY; - len2 = buffer->len; + len2 = silc_buffer_len(buffer); /* Parse start of the payload */ ret = silc_buffer_unformat(buffer, @@ -287,7 +285,7 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske, } if (ske->start_payload && - ((payload->pk_type < SILC_SKE_PK_TYPE_SILC || + ((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; @@ -302,7 +300,7 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske, SILC_STR_UI_XNSTRING_ALLOC(&payload->pk_data, payload->pk_len), SILC_STR_UI16_NSTRING_ALLOC(&x, &x_len), - SILC_STR_UI16_NSTRING_ALLOC(&payload->sign_data, + SILC_STR_UI16_NSTRING_ALLOC(&payload->sign_data, &payload->sign_len), SILC_STR_END); if (ret == -1) { @@ -320,7 +318,7 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske, goto err; } - if (ske->start_payload && + 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 " @@ -334,7 +332,7 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske, status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH; goto err; } - + /* Decode the binary data to integer */ silc_mp_init(&payload->x); silc_mp_bin2mp(x, x_len, &payload->x); @@ -357,7 +355,7 @@ SilcSKEStatus silc_ske_payload_ke_decode(SilcSKE ske, /* Free's KE Payload */ -void silc_ske_payload_ke_free(SilcSKEKEPayload *payload) +void silc_ske_payload_ke_free(SilcSKEKEPayload payload) { if (payload) { silc_free(payload->pk_data);