/*
* $Id$
* $Log$
- * Revision 1.1 2000/06/27 11:36:56 priikone
- * Initial revision
+ * Revision 1.6 2000/10/31 19:48:31 priikone
+ * A LOT updates. Cannot separate. :)
+ *
+ * Revision 1.5 2000/07/19 07:04:37 priikone
+ * Added version detection support to SKE. Minor bugfixes.
+ *
+ * Revision 1.4 2000/07/10 05:34:22 priikone
+ * Added mp binary encoding as protocols defines.
+ *
+ * Revision 1.3 2000/07/07 06:46:43 priikone
+ * Removed ske_verify_public_key function as it is not needed
+ * anymore. Added support to the public key verification as callback
+ * function. Other minor changes and bug fixes.
+ *
+ * Revision 1.2 2000/07/05 06:05:15 priikone
+ * Global cosmetic change.
+ *
+ * Revision 1.1.1.1 2000/06/27 11:36:56 priikone
+ * Imported from internal CVS/Added Log headers.
*
*
*/
/* Allocate channel payload buffer. */
buf = silc_buffer_alloc(payload->len);
- if (!buf) {
- SILC_LOG_ERROR(("Could not allocate encode buffer"));
- return SILC_SKE_STATUS_ERROR;
- }
silc_buffer_pull_tail(buf, payload->len);
SILC_STR_UI_SHORT(payload->len),
SILC_STR_UI_XNSTRING(payload->cookie,
payload->cookie_len),
+ SILC_STR_UI_SHORT(payload->version_len),
+ 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,
payload->ke_grp_len),
SILC_STR_UI_CHAR(&payload->flags),
SILC_STR_UI_SHORT(&payload->len),
SILC_STR_UI_XNSTRING(&buf, SILC_SKE_COOKIE_LEN),
+ SILC_STR_UI16_NSTRING_ALLOC(&payload->version,
+ &payload->version_len),
SILC_STR_UI_SHORT(&payload->ke_grp_len),
SILC_STR_END);
goto err;
}
- len2 = len = 1 + 1 + 2 + SILC_SKE_COOKIE_LEN + 2;
+ len2 = len = 1 + 1 + 2 + SILC_SKE_COOKIE_LEN + 2 + payload->version_len + 2;
silc_buffer_pull(buffer, len);
/* Copy cookie from payload */
err:
silc_ske_payload_start_free(payload);
+ ske->status = status;
return status;
}
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)
{
SilcBuffer buf;
unsigned char *e_str;
- unsigned short e_len;
+ unsigned int e_len;
SILC_LOG_DEBUG(("Encoding KE 1 Payload"));
if (!payload)
return SILC_SKE_STATUS_ERROR;
- /* Encode the integer into HEX string */
- e_len = silc_mp_sizeinbase(&payload->e, 16);
- e_str = silc_calloc(e_len + 1, sizeof(unsigned char));
- silc_mp_get_str(e_str, 16, &payload->e);
+ /* Encode the integer into binary data */
+ e_str = silc_mp_mp2bin(&payload->e, &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);
- if (!buf) {
- SILC_LOG_ERROR(("Could not allocate encode buffer"));
- return SILC_SKE_STATUS_ERROR;
- }
-
- silc_buffer_pull_tail(buf, e_len + 2);
+ buf = silc_buffer_alloc(e_len + 2 + payload->pk_len + 2 + 2);
+ silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
/* Encode the payload */
silc_buffer_format(buf,
- SILC_STR_UI_SHORT(e_len + 2),
+ 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);
{
SilcSKEOnePayload *payload;
SilcSKEStatus status = SILC_SKE_STATUS_ERROR;
+ unsigned char *e;
unsigned short e_len;
SILC_LOG_DEBUG(("Decoding Key Exchange 1 Payload"));
payload = silc_calloc(1, sizeof(*payload));
- memset(buf, 0, sizeof(buf));
-
- /* Parse the payload */
silc_buffer_unformat(buffer,
- SILC_STR_UI_SHORT(&e_len),
+ SILC_STR_UI_SHORT(&payload->pk_len),
+ SILC_STR_UI_SHORT(&payload->pk_type),
SILC_STR_END);
- if (e_len < 1) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
+ if (payload->pk_len < 5) {
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
- if (e_len != buffer->len) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
+ silc_buffer_pull(buffer, 2 + 2);
+ 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 (e_len < 3) {
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
- /* Length includes the length field length as well. Remove it. */
- e_len -= 2;
+ silc_buffer_push(buffer, 2 + 2);
- silc_buffer_unformat(buffer,
- SILC_STR_UI_SHORT(NULL),
- SILC_STR_UI_XNSTRING(&buf, e_len),
- SILC_STR_END);
+ 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_set_str(&payload->e, buf, 16);
- memset(buf, 0, sizeof(buf));
+ silc_mp_bin2mp(e, e_len, &payload->e);
+ memset(e, 0, sizeof(e_len));
+ silc_free(e);
/* Return the payload */
*return_payload = payload;
err:
silc_free(payload);
-
+ ske->status = status;
return status;
}
void silc_ske_payload_one_free(SilcSKEOnePayload *payload)
{
if (payload) {
- silc_mp_clear(&payload->e);
+ if (payload->pk_data)
+ silc_free(payload->pk_data);
silc_free(payload);
}
}
return SILC_SKE_STATUS_ERROR;
/* Encode the integer into HEX string */
- f_len = silc_mp_sizeinbase(&payload->f, 16);
- f_str = silc_calloc(f_len + 1, sizeof(unsigned char));
- silc_mp_get_str(f_str, 16, &payload->f);
+ f_str = silc_mp_mp2bin(&payload->f, &f_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);
- if (!buf) {
- SILC_LOG_ERROR(("Could not allocate encode buffer"));
- return SILC_SKE_STATUS_ERROR;
- }
silc_buffer_pull_tail(buf, len);
/* Encode the payload */
silc_buffer_format(buf,
- SILC_STR_UI_SHORT(payload->pk_len + 4),
+ 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(f_len + 2),
+ SILC_STR_UI_SHORT(f_len),
SILC_STR_UI_XNSTRING(f_str, f_len),
- SILC_STR_UI_SHORT(payload->sign_len + 2),
+ SILC_STR_UI_SHORT(payload->sign_len),
SILC_STR_UI_XNSTRING(payload->sign_data,
payload->sign_len),
SILC_STR_END);
{
SilcSKEStatus status = SILC_SKE_STATUS_ERROR;
SilcSKETwoPayload *payload;
+ unsigned char *f;
unsigned short f_len;
unsigned int tot_len = 0, len2;
SILC_STR_END);
if (payload->pk_len < 5) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
- tot_len += payload->pk_len;
+ tot_len += payload->pk_len + 4;
- payload->pk_len -= 4;
silc_buffer_pull(buffer, 4);
silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING(&buf, payload->pk_len),
- SILC_STR_UI_SHORT(&f_len),
+ SILC_STR_UI_XNSTRING_ALLOC(&payload->pk_data,
+ payload->pk_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&f, &f_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&payload->sign_data,
+ &payload->sign_len),
SILC_STR_END);
+ tot_len += f_len + 2;
+ tot_len += payload->sign_len + 2;
+
if (f_len < 3) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
- tot_len += f_len;
-
- payload->pk_data = silc_calloc(payload->pk_len + 1,
- sizeof(unsigned char));
- memcpy(payload->pk_data, buf, payload->pk_len);
- memset(buf, 0, sizeof(buf));
-
- f_len -= 2;
- silc_buffer_pull(buffer, payload->pk_len + 2);
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING(&buf, f_len),
- SILC_STR_UI_SHORT(&payload->sign_len),
- SILC_STR_END);
-
if (payload->sign_len < 3) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
- tot_len += payload->sign_len;
-
if (tot_len != len2) {
- status = SILC_SKE_STATUS_BAD_PAYLOAD_LENGTH;
+ status = SILC_SKE_STATUS_BAD_PAYLOAD;
goto err;
}
/* Decode the HEX string to integer */
silc_mp_init(&payload->f);
- silc_mp_set_str(&payload->f, buf, 16);
- memset(buf, 0, sizeof(buf));
-
- payload->sign_len -= 2;
- silc_buffer_pull(buffer, f_len + 2);
- silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING(&buf, payload->sign_len),
- SILC_STR_END);
-
- payload->sign_data = silc_calloc(payload->sign_len + 1,
- sizeof(unsigned char));
- memcpy(payload->sign_data, buf, payload->sign_len);
- memset(buf, 0, sizeof(buf));
+ silc_mp_bin2mp(f, f_len, &payload->f);
+ memset(f, 0, sizeof(f_len));
+ silc_free(f);
/* Return the payload */
*return_payload = payload;
if (payload->sign_data)
silc_free(payload->sign_data);
silc_free(payload);
-
+ ske->status = status;
return status;
}
silc_free(payload->pk_data);
if (payload->sign_data)
silc_free(payload->sign_data);
- silc_mp_clear(&payload->f);
silc_free(payload);
}
}
projects / silc.git / blobdiff