free(this);
}
-METHOD(imv_state_t, another_round, bool,
+METHOD(imv_test_state_t, another_round, bool,
private_imv_test_state_t *this)
{
return (this->rounds-- > 0);
--- /dev/null
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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. See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * 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 GNU General Public License
+ * for more details.
+ */
+
+#include "tls_reader.h"
+
+#include <debug.h>
+
+typedef struct private_tls_reader_t private_tls_reader_t;
+
+/**
+ * Private data of an tls_reader_t object.
+ */
+struct private_tls_reader_t {
+
+ /**
+ * Public tls_reader_t interface.
+ */
+ tls_reader_t public;
+
+ /**
+ * Remaining data to process
+ */
+ chunk_t buf;
+};
+
+METHOD(tls_reader_t, remaining, u_int32_t,
+ private_tls_reader_t *this)
+{
+ return this->buf.len;
+}
+
+METHOD(tls_reader_t, peek, chunk_t,
+ private_tls_reader_t *this)
+{
+ return this->buf;
+}
+
+METHOD(tls_reader_t, read_uint8, bool,
+ private_tls_reader_t *this, u_int8_t *res)
+{
+ if (this->buf.len < 1)
+ {
+ DBG1(DBG_TLS, "%d bytes insufficient to parse u_int8 data",
+ this->buf.len);
+ return FALSE;
+ }
+ *res = this->buf.ptr[0];
+ this->buf = chunk_skip(this->buf, 1);
+ return TRUE;
+}
+
+METHOD(tls_reader_t, read_uint16, bool,
+ private_tls_reader_t *this, u_int16_t *res)
+{
+ if (this->buf.len < 2)
+ {
+ DBG1(DBG_TLS, "%d bytes insufficient to parse u_int16 data",
+ this->buf.len);
+ return FALSE;
+ }
+ *res = untoh16(this->buf.ptr);
+ this->buf = chunk_skip(this->buf, 2);
+ return TRUE;
+}
+
+METHOD(tls_reader_t, read_uint24, bool,
+ private_tls_reader_t *this, u_int32_t *res)
+{
+ if (this->buf.len < 3)
+ {
+ DBG1(DBG_TLS, "%d bytes insufficient to parse u_int24 data",
+ this->buf.len);
+ return FALSE;
+ }
+ *res = untoh32(this->buf.ptr) >> 8;
+ this->buf = chunk_skip(this->buf, 3);
+ return TRUE;
+}
+
+METHOD(tls_reader_t, read_uint32, bool,
+ private_tls_reader_t *this, u_int32_t *res)
+{
+ if (this->buf.len < 4)
+ {
+ DBG1(DBG_TLS, "%d bytes insufficient to parse u_int32 data",
+ this->buf.len);
+ return FALSE;
+ }
+ *res = untoh32(this->buf.ptr);
+ this->buf = chunk_skip(this->buf, 4);
+ return TRUE;
+}
+
+METHOD(tls_reader_t, read_data, bool,
+ private_tls_reader_t *this, u_int32_t len, chunk_t *res)
+{
+ if (this->buf.len < len)
+ {
+ DBG1(DBG_TLS, "%d bytes insufficient to parse %d bytes of data",
+ this->buf.len, len);
+ return FALSE;
+ }
+ *res = chunk_create(this->buf.ptr, len);
+ this->buf = chunk_skip(this->buf, len);
+ return TRUE;
+}
+
+METHOD(tls_reader_t, read_data8, bool,
+ private_tls_reader_t *this, chunk_t *res)
+{
+ u_int8_t len;
+
+ if (!read_uint8(this, &len))
+ {
+ return FALSE;
+ }
+ return read_data(this, len, res);
+}
+
+METHOD(tls_reader_t, read_data16, bool,
+ private_tls_reader_t *this, chunk_t *res)
+{
+ u_int16_t len;
+
+ if (!read_uint16(this, &len))
+ {
+ return FALSE;
+ }
+ return read_data(this, len, res);
+}
+
+METHOD(tls_reader_t, read_data24, bool,
+ private_tls_reader_t *this, chunk_t *res)
+{
+ u_int32_t len;
+
+ if (!read_uint24(this, &len))
+ {
+ return FALSE;
+ }
+ return read_data(this, len, res);
+}
+
+METHOD(tls_reader_t, read_data32, bool,
+ private_tls_reader_t *this, chunk_t *res)
+{
+ u_int32_t len;
+
+ if (!read_uint32(this, &len))
+ {
+ return FALSE;
+ }
+ return read_data(this, len, res);
+}
+
+METHOD(tls_reader_t, destroy, void,
+ private_tls_reader_t *this)
+{
+ free(this);
+}
+
+/**
+ * See header
+ */
+tls_reader_t *tls_reader_create(chunk_t data)
+{
+ private_tls_reader_t *this;
+
+ INIT(this,
+ .public = {
+ .remaining = _remaining,
+ .peek = _peek,
+ .read_uint8 = _read_uint8,
+ .read_uint16 = _read_uint16,
+ .read_uint24 = _read_uint24,
+ .read_uint32 = _read_uint32,
+ .read_data = _read_data,
+ .read_data8 = _read_data8,
+ .read_data16 = _read_data16,
+ .read_data24 = _read_data24,
+ .read_data32 = _read_data32,
+ .destroy = _destroy,
+ },
+ .buf = data,
+ );
+
+ return &this->public;
+}
--- /dev/null
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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. See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * 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 GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup tls_reader tls_reader
+ * @{ @ingroup libtls
+ */
+
+#ifndef TLS_READER_H_
+#define TLS_READER_H_
+
+typedef struct tls_reader_t tls_reader_t;
+
+#include <library.h>
+
+/**
+ * TLS record parser.
+ */
+struct tls_reader_t {
+
+ /**
+ * Get the number of remaining bytes.
+ *
+ * @return number of remaining bytes in buffer
+ */
+ u_int32_t (*remaining)(tls_reader_t *this);
+
+ /**
+ * Peek the remaining data, not consuming any bytes.
+ *
+ * @return remaining data
+ */
+ chunk_t (*peek)(tls_reader_t *this);
+
+ /**
+ * Read a 8-bit integer from the buffer, advance.
+ *
+ * @param res pointer to result
+ * @return TRUE if integer read successfully
+ */
+ bool (*read_uint8)(tls_reader_t *this, u_int8_t *res);
+
+ /**
+ * Read a 16-bit integer from the buffer, advance.
+ *
+ * @param res pointer to result
+ * @return TRUE if integer read successfully
+ */
+ bool (*read_uint16)(tls_reader_t *this, u_int16_t *res);
+
+ /**
+ * Read a 24-bit integer from the buffer, advance.
+ *
+ * @param res pointer to result
+ * @return TRUE if integer read successfully
+ */
+ bool (*read_uint24)(tls_reader_t *this, u_int32_t *res);
+
+ /**
+ * Read a 32-bit integer from the buffer, advance.
+ *
+ * @param res pointer to result
+ * @return TRUE if integer read successfully
+ */
+ bool (*read_uint32)(tls_reader_t *this, u_int32_t *res);
+
+ /**
+ * Read a chunk of len bytes, advance.
+ *
+ * @param len number of bytes to read
+ * @param res pointer to result, not cloned
+ * @return TRUE if data read successfully
+ */
+ bool (*read_data)(tls_reader_t *this, u_int32_t len, chunk_t *res);
+
+ /**
+ * Read a chunk of bytes with a 8-bit length header, advance.
+ *
+ * @param res pointer to result, not cloned
+ * @return TRUE if data read successfully
+ */
+ bool (*read_data8)(tls_reader_t *this, chunk_t *res);
+
+ /**
+ * Read a chunk of bytes with a 16-bit length header, advance.
+ *
+ * @param res pointer to result, not cloned
+ * @return TRUE if data read successfully
+ */
+ bool (*read_data16)(tls_reader_t *this, chunk_t *res);
+
+ /**
+ * Read a chunk of bytes with a 24-bit length header, advance.
+ *
+ * @param res pointer to result, not cloned
+ * @return TRUE if data read successfully
+ */
+ bool (*read_data24)(tls_reader_t *this, chunk_t *res);
+
+ /**
+ * Read a chunk of bytes with a 32-bit length header, advance.
+ *
+ * @param res pointer to result, not cloned
+ * @return TRUE if data read successfully
+ */
+ bool (*read_data32)(tls_reader_t *this, chunk_t *res);
+
+ /**
+ * Destroy a tls_reader_t.
+ */
+ void (*destroy)(tls_reader_t *this);
+};
+
+/**
+ * Create a tls_reader instance.
+ */
+tls_reader_t *tls_reader_create(chunk_t data);
+
+#endif /** tls_reader_H_ @}*/
--- /dev/null
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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. See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * 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 GNU General Public License
+ * for more details.
+ */
+
+#include "tls_writer.h"
+
+typedef struct private_tls_writer_t private_tls_writer_t;
+
+/**
+ * Private data of an tls_writer_t object.
+ */
+struct private_tls_writer_t {
+
+ /**
+ * Public tls_writer_t interface.
+ */
+ tls_writer_t public;
+
+ /**
+ * Allocated buffer
+ */
+ chunk_t buf;
+
+ /**
+ * Used bytes in buffer
+ */
+ size_t used;
+
+ /**
+ * Number of bytes to increase buffer size
+ */
+ size_t increase;
+};
+
+/**
+ * Increase buffer size
+ */
+static void increase(private_tls_writer_t *this)
+{
+ this->buf.len += this->increase;
+ this->buf.ptr = realloc(this->buf.ptr, this->buf.len);
+}
+
+METHOD(tls_writer_t, write_uint8, void,
+ private_tls_writer_t *this, u_int8_t value)
+{
+ if (this->used + 1 > this->buf.len)
+ {
+ increase(this);
+ }
+ this->buf.ptr[this->used] = value;
+ this->used += 1;
+}
+
+METHOD(tls_writer_t, write_uint16, void,
+ private_tls_writer_t *this, u_int16_t value)
+{
+ if (this->used + 2 > this->buf.len)
+ {
+ increase(this);
+ }
+ htoun16(this->buf.ptr + this->used, value);
+ this->used += 2;
+}
+
+METHOD(tls_writer_t, write_uint24, void,
+ private_tls_writer_t *this, u_int32_t value)
+{
+ if (this->used + 3 > this->buf.len)
+ {
+ increase(this);
+ }
+ value = htonl(value);
+ memcpy(this->buf.ptr + this->used, ((char*)&value) + 1, 3);
+ this->used += 3;
+}
+
+METHOD(tls_writer_t, write_uint32, void,
+ private_tls_writer_t *this, u_int32_t value)
+{
+ if (this->used + 4 > this->buf.len)
+ {
+ increase(this);
+ }
+ htoun32(this->buf.ptr + this->used, value);
+ this->used += 4;
+}
+
+METHOD(tls_writer_t, write_data, void,
+ private_tls_writer_t *this, chunk_t value)
+{
+ while (this->used + value.len > this->buf.len)
+ {
+ increase(this);
+ }
+ memcpy(this->buf.ptr + this->used, value.ptr, value.len);
+ this->used += value.len;
+}
+
+METHOD(tls_writer_t, write_data8, void,
+ private_tls_writer_t *this, chunk_t value)
+{
+ write_uint8(this, value.len);
+ write_data(this, value);
+}
+
+METHOD(tls_writer_t, write_data16, void,
+ private_tls_writer_t *this, chunk_t value)
+{
+ write_uint16(this, value.len);
+ write_data(this, value);
+}
+
+METHOD(tls_writer_t, write_data24, void,
+ private_tls_writer_t *this, chunk_t value)
+{
+ write_uint24(this, value.len);
+ write_data(this, value);
+}
+
+METHOD(tls_writer_t, write_data32, void,
+ private_tls_writer_t *this, chunk_t value)
+{
+ write_uint32(this, value.len);
+ write_data(this, value);
+}
+
+METHOD(tls_writer_t, wrap8, void,
+ private_tls_writer_t *this)
+{
+ if (this->used + 1 > this->buf.len)
+ {
+ increase(this);
+ }
+ memmove(this->buf.ptr + 1, this->buf.ptr, this->used);
+ this->buf.ptr[0] = this->used;
+ this->used += 1;
+}
+
+METHOD(tls_writer_t, wrap16, void,
+ private_tls_writer_t *this)
+{
+ if (this->used + 2 > this->buf.len)
+ {
+ increase(this);
+ }
+ memmove(this->buf.ptr + 2, this->buf.ptr, this->used);
+ htoun16(this->buf.ptr, this->used);
+ this->used += 2;
+}
+
+METHOD(tls_writer_t, wrap24, void,
+ private_tls_writer_t *this)
+{
+ u_int32_t len;
+
+ if (this->used + 3 > this->buf.len)
+ {
+ increase(this);
+ }
+ memmove(this->buf.ptr + 3, this->buf.ptr, this->used);
+
+ len = htonl(this->used);
+ memcpy(this->buf.ptr, ((char*)&len) + 1, 3);
+ this->used += 3;
+}
+
+METHOD(tls_writer_t, wrap32, void,
+ private_tls_writer_t *this)
+{
+ if (this->used + 4 > this->buf.len)
+ {
+ increase(this);
+ }
+ memmove(this->buf.ptr + 4, this->buf.ptr, this->used);
+ htoun32(this->buf.ptr, this->used);
+ this->used += 4;
+}
+
+METHOD(tls_writer_t, get_buf, chunk_t,
+ private_tls_writer_t *this)
+{
+ return chunk_create(this->buf.ptr, this->used);
+}
+
+METHOD(tls_writer_t, destroy, void,
+ private_tls_writer_t *this)
+{
+ free(this->buf.ptr);
+ free(this);
+}
+
+/**
+ * See header
+ */
+tls_writer_t *tls_writer_create(u_int32_t bufsize)
+{
+ private_tls_writer_t *this;
+
+ INIT(this,
+ .public = {
+ .write_uint8 = _write_uint8,
+ .write_uint16 = _write_uint16,
+ .write_uint24 = _write_uint24,
+ .write_uint32 = _write_uint32,
+ .write_data = _write_data,
+ .write_data8 = _write_data8,
+ .write_data16 = _write_data16,
+ .write_data24 = _write_data24,
+ .write_data32 = _write_data32,
+ .wrap8 = _wrap8,
+ .wrap16 = _wrap16,
+ .wrap24 = _wrap24,
+ .wrap32 = _wrap32,
+ .get_buf = _get_buf,
+ .destroy = _destroy,
+ },
+ .increase = bufsize ? max(bufsize, 4) : 32,
+ );
+ if (bufsize)
+ {
+ this->buf = chunk_alloc(bufsize);
+ }
+
+ return &this->public;
+}
--- /dev/null
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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. See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * 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 GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup tls_writer tls_writer
+ * @{ @ingroup libtls
+ */
+
+#ifndef TLS_WRITER_H_
+#define TLS_WRITER_H_
+
+typedef struct tls_writer_t tls_writer_t;
+
+#include <library.h>
+
+/**
+ * TLS record generator.
+ */
+struct tls_writer_t {
+
+ /**
+ * Append a 8-bit integer to the buffer.
+ *
+ * @param value value to append
+ */
+ void (*write_uint8)(tls_writer_t *this, u_int8_t value);
+
+ /**
+ * Append a 16-bit integer to the buffer.
+ *
+ * @param value value to append
+ */
+ void (*write_uint16)(tls_writer_t *this, u_int16_t value);
+
+ /**
+ * Append a 24-bit integer to the buffer.
+ *
+ * @param value value to append
+ */
+ void (*write_uint24)(tls_writer_t *this, u_int32_t value);
+
+ /**
+ * Append a 32-bit integer to the buffer.
+ *
+ * @param value value to append
+ */
+ void (*write_uint32)(tls_writer_t *this, u_int32_t value);
+
+ /**
+ * Append a chunk of data without a length header.
+ *
+ * @param value value to append
+ */
+ void (*write_data)(tls_writer_t *this, chunk_t value);
+
+ /**
+ * Append a chunk of data with a 8-bit length header.
+ *
+ * @param value value to append
+ */
+ void (*write_data8)(tls_writer_t *this, chunk_t value);
+
+ /**
+ * Append a chunk of data with a 16-bit length header.
+ *
+ * @param value value to append
+ */
+ void (*write_data16)(tls_writer_t *this, chunk_t value);
+
+ /**
+ * Append a chunk of data with a 24-bit length header.
+ *
+ * @param value value to append
+ */
+ void (*write_data24)(tls_writer_t *this, chunk_t value);
+
+ /**
+ * Append a chunk of data with a 32-bit length header.
+ *
+ * @param value value to append
+ */
+ void (*write_data32)(tls_writer_t *this, chunk_t value);
+
+ /**
+ * Prepend a 8-bit length header to existing data.
+ */
+ void (*wrap8)(tls_writer_t *this);
+
+ /**
+ * Prepend a 16-bit length header to existing data.
+ */
+ void (*wrap16)(tls_writer_t *this);
+
+ /**
+ * Prepend a 24-bit length header to existing data.
+ */
+ void (*wrap24)(tls_writer_t *this);
+
+ /**
+ * Prepend a 32-bit length header to existing data.
+ */
+ void (*wrap32)(tls_writer_t *this);
+
+ /**
+ * Get the encoded data buffer.
+ *
+ * @return chunk to internal buffer
+ */
+ chunk_t (*get_buf)(tls_writer_t *this);
+
+ /**
+ * Destroy a tls_writer_t.
+ */
+ void (*destroy)(tls_writer_t *this);
+};
+
+/**
+ * Create a tls_writer instance.
+ *
+ * @param bufsize initially allocated buffer size
+ */
+tls_writer_t *tls_writer_create(u_int32_t bufsize);
+
+#endif /** TLS_WRITER_H_ @}*/
+++ /dev/null
-/*
- * Copyright (C) 2010 Martin Willi
- * Copyright (C) 2010 revosec AG
- *
- * 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. See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * 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 GNU General Public License
- * for more details.
- */
-
-#include "tls_reader.h"
-
-#include <debug.h>
-
-typedef struct private_tls_reader_t private_tls_reader_t;
-
-/**
- * Private data of an tls_reader_t object.
- */
-struct private_tls_reader_t {
-
- /**
- * Public tls_reader_t interface.
- */
- tls_reader_t public;
-
- /**
- * Remaining data to process
- */
- chunk_t buf;
-};
-
-METHOD(tls_reader_t, remaining, u_int32_t,
- private_tls_reader_t *this)
-{
- return this->buf.len;
-}
-
-METHOD(tls_reader_t, peek, chunk_t,
- private_tls_reader_t *this)
-{
- return this->buf;
-}
-
-METHOD(tls_reader_t, read_uint8, bool,
- private_tls_reader_t *this, u_int8_t *res)
-{
- if (this->buf.len < 1)
- {
- DBG1(DBG_TLS, "%d bytes insufficient to parse u_int8 data",
- this->buf.len);
- return FALSE;
- }
- *res = this->buf.ptr[0];
- this->buf = chunk_skip(this->buf, 1);
- return TRUE;
-}
-
-METHOD(tls_reader_t, read_uint16, bool,
- private_tls_reader_t *this, u_int16_t *res)
-{
- if (this->buf.len < 2)
- {
- DBG1(DBG_TLS, "%d bytes insufficient to parse u_int16 data",
- this->buf.len);
- return FALSE;
- }
- *res = untoh16(this->buf.ptr);
- this->buf = chunk_skip(this->buf, 2);
- return TRUE;
-}
-
-METHOD(tls_reader_t, read_uint24, bool,
- private_tls_reader_t *this, u_int32_t *res)
-{
- if (this->buf.len < 3)
- {
- DBG1(DBG_TLS, "%d bytes insufficient to parse u_int24 data",
- this->buf.len);
- return FALSE;
- }
- *res = untoh32(this->buf.ptr) >> 8;
- this->buf = chunk_skip(this->buf, 3);
- return TRUE;
-}
-
-METHOD(tls_reader_t, read_uint32, bool,
- private_tls_reader_t *this, u_int32_t *res)
-{
- if (this->buf.len < 4)
- {
- DBG1(DBG_TLS, "%d bytes insufficient to parse u_int32 data",
- this->buf.len);
- return FALSE;
- }
- *res = untoh32(this->buf.ptr);
- this->buf = chunk_skip(this->buf, 4);
- return TRUE;
-}
-
-METHOD(tls_reader_t, read_data, bool,
- private_tls_reader_t *this, u_int32_t len, chunk_t *res)
-{
- if (this->buf.len < len)
- {
- DBG1(DBG_TLS, "%d bytes insufficient to parse %d bytes of data",
- this->buf.len, len);
- return FALSE;
- }
- *res = chunk_create(this->buf.ptr, len);
- this->buf = chunk_skip(this->buf, len);
- return TRUE;
-}
-
-METHOD(tls_reader_t, read_data8, bool,
- private_tls_reader_t *this, chunk_t *res)
-{
- u_int8_t len;
-
- if (!read_uint8(this, &len))
- {
- return FALSE;
- }
- return read_data(this, len, res);
-}
-
-METHOD(tls_reader_t, read_data16, bool,
- private_tls_reader_t *this, chunk_t *res)
-{
- u_int16_t len;
-
- if (!read_uint16(this, &len))
- {
- return FALSE;
- }
- return read_data(this, len, res);
-}
-
-METHOD(tls_reader_t, read_data24, bool,
- private_tls_reader_t *this, chunk_t *res)
-{
- u_int32_t len;
-
- if (!read_uint24(this, &len))
- {
- return FALSE;
- }
- return read_data(this, len, res);
-}
-
-METHOD(tls_reader_t, read_data32, bool,
- private_tls_reader_t *this, chunk_t *res)
-{
- u_int32_t len;
-
- if (!read_uint32(this, &len))
- {
- return FALSE;
- }
- return read_data(this, len, res);
-}
-
-METHOD(tls_reader_t, destroy, void,
- private_tls_reader_t *this)
-{
- free(this);
-}
-
-/**
- * See header
- */
-tls_reader_t *tls_reader_create(chunk_t data)
-{
- private_tls_reader_t *this;
-
- INIT(this,
- .public = {
- .remaining = _remaining,
- .peek = _peek,
- .read_uint8 = _read_uint8,
- .read_uint16 = _read_uint16,
- .read_uint24 = _read_uint24,
- .read_uint32 = _read_uint32,
- .read_data = _read_data,
- .read_data8 = _read_data8,
- .read_data16 = _read_data16,
- .read_data24 = _read_data24,
- .read_data32 = _read_data32,
- .destroy = _destroy,
- },
- .buf = data,
- );
-
- return &this->public;
-}
+++ /dev/null
-/*
- * Copyright (C) 2010 Martin Willi
- * Copyright (C) 2010 revosec AG
- *
- * 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. See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * 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 GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup tls_reader tls_reader
- * @{ @ingroup libtls
- */
-
-#ifndef TLS_READER_H_
-#define TLS_READER_H_
-
-typedef struct tls_reader_t tls_reader_t;
-
-#include <library.h>
-
-/**
- * TLS record parser.
- */
-struct tls_reader_t {
-
- /**
- * Get the number of remaining bytes.
- *
- * @return number of remaining bytes in buffer
- */
- u_int32_t (*remaining)(tls_reader_t *this);
-
- /**
- * Peek the remaining data, not consuming any bytes.
- *
- * @return remaining data
- */
- chunk_t (*peek)(tls_reader_t *this);
-
- /**
- * Read a 8-bit integer from the buffer, advance.
- *
- * @param res pointer to result
- * @return TRUE if integer read successfully
- */
- bool (*read_uint8)(tls_reader_t *this, u_int8_t *res);
-
- /**
- * Read a 16-bit integer from the buffer, advance.
- *
- * @param res pointer to result
- * @return TRUE if integer read successfully
- */
- bool (*read_uint16)(tls_reader_t *this, u_int16_t *res);
-
- /**
- * Read a 24-bit integer from the buffer, advance.
- *
- * @param res pointer to result
- * @return TRUE if integer read successfully
- */
- bool (*read_uint24)(tls_reader_t *this, u_int32_t *res);
-
- /**
- * Read a 32-bit integer from the buffer, advance.
- *
- * @param res pointer to result
- * @return TRUE if integer read successfully
- */
- bool (*read_uint32)(tls_reader_t *this, u_int32_t *res);
-
- /**
- * Read a chunk of len bytes, advance.
- *
- * @param len number of bytes to read
- * @param res pointer to result, not cloned
- * @return TRUE if data read successfully
- */
- bool (*read_data)(tls_reader_t *this, u_int32_t len, chunk_t *res);
-
- /**
- * Read a chunk of bytes with a 8-bit length header, advance.
- *
- * @param res pointer to result, not cloned
- * @return TRUE if data read successfully
- */
- bool (*read_data8)(tls_reader_t *this, chunk_t *res);
-
- /**
- * Read a chunk of bytes with a 16-bit length header, advance.
- *
- * @param res pointer to result, not cloned
- * @return TRUE if data read successfully
- */
- bool (*read_data16)(tls_reader_t *this, chunk_t *res);
-
- /**
- * Read a chunk of bytes with a 24-bit length header, advance.
- *
- * @param res pointer to result, not cloned
- * @return TRUE if data read successfully
- */
- bool (*read_data24)(tls_reader_t *this, chunk_t *res);
-
- /**
- * Read a chunk of bytes with a 32-bit length header, advance.
- *
- * @param res pointer to result, not cloned
- * @return TRUE if data read successfully
- */
- bool (*read_data32)(tls_reader_t *this, chunk_t *res);
-
- /**
- * Destroy a tls_reader_t.
- */
- void (*destroy)(tls_reader_t *this);
-};
-
-/**
- * Create a tls_reader instance.
- */
-tls_reader_t *tls_reader_create(chunk_t data);
-
-#endif /** tls_reader_H_ @}*/
+++ /dev/null
-/*
- * Copyright (C) 2010 Martin Willi
- * Copyright (C) 2010 revosec AG
- *
- * 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. See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * 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 GNU General Public License
- * for more details.
- */
-
-#include "tls_writer.h"
-
-typedef struct private_tls_writer_t private_tls_writer_t;
-
-/**
- * Private data of an tls_writer_t object.
- */
-struct private_tls_writer_t {
-
- /**
- * Public tls_writer_t interface.
- */
- tls_writer_t public;
-
- /**
- * Allocated buffer
- */
- chunk_t buf;
-
- /**
- * Used bytes in buffer
- */
- size_t used;
-
- /**
- * Number of bytes to increase buffer size
- */
- size_t increase;
-};
-
-/**
- * Increase buffer size
- */
-static void increase(private_tls_writer_t *this)
-{
- this->buf.len += this->increase;
- this->buf.ptr = realloc(this->buf.ptr, this->buf.len);
-}
-
-METHOD(tls_writer_t, write_uint8, void,
- private_tls_writer_t *this, u_int8_t value)
-{
- if (this->used + 1 > this->buf.len)
- {
- increase(this);
- }
- this->buf.ptr[this->used] = value;
- this->used += 1;
-}
-
-METHOD(tls_writer_t, write_uint16, void,
- private_tls_writer_t *this, u_int16_t value)
-{
- if (this->used + 2 > this->buf.len)
- {
- increase(this);
- }
- htoun16(this->buf.ptr + this->used, value);
- this->used += 2;
-}
-
-METHOD(tls_writer_t, write_uint24, void,
- private_tls_writer_t *this, u_int32_t value)
-{
- if (this->used + 3 > this->buf.len)
- {
- increase(this);
- }
- value = htonl(value);
- memcpy(this->buf.ptr + this->used, ((char*)&value) + 1, 3);
- this->used += 3;
-}
-
-METHOD(tls_writer_t, write_uint32, void,
- private_tls_writer_t *this, u_int32_t value)
-{
- if (this->used + 4 > this->buf.len)
- {
- increase(this);
- }
- htoun32(this->buf.ptr + this->used, value);
- this->used += 4;
-}
-
-METHOD(tls_writer_t, write_data, void,
- private_tls_writer_t *this, chunk_t value)
-{
- while (this->used + value.len > this->buf.len)
- {
- increase(this);
- }
- memcpy(this->buf.ptr + this->used, value.ptr, value.len);
- this->used += value.len;
-}
-
-METHOD(tls_writer_t, write_data8, void,
- private_tls_writer_t *this, chunk_t value)
-{
- write_uint8(this, value.len);
- write_data(this, value);
-}
-
-METHOD(tls_writer_t, write_data16, void,
- private_tls_writer_t *this, chunk_t value)
-{
- write_uint16(this, value.len);
- write_data(this, value);
-}
-
-METHOD(tls_writer_t, write_data24, void,
- private_tls_writer_t *this, chunk_t value)
-{
- write_uint24(this, value.len);
- write_data(this, value);
-}
-
-METHOD(tls_writer_t, write_data32, void,
- private_tls_writer_t *this, chunk_t value)
-{
- write_uint32(this, value.len);
- write_data(this, value);
-}
-
-METHOD(tls_writer_t, wrap8, void,
- private_tls_writer_t *this)
-{
- if (this->used + 1 > this->buf.len)
- {
- increase(this);
- }
- memmove(this->buf.ptr + 1, this->buf.ptr, this->used);
- this->buf.ptr[0] = this->used;
- this->used += 1;
-}
-
-METHOD(tls_writer_t, wrap16, void,
- private_tls_writer_t *this)
-{
- if (this->used + 2 > this->buf.len)
- {
- increase(this);
- }
- memmove(this->buf.ptr + 2, this->buf.ptr, this->used);
- htoun16(this->buf.ptr, this->used);
- this->used += 2;
-}
-
-METHOD(tls_writer_t, wrap24, void,
- private_tls_writer_t *this)
-{
- u_int32_t len;
-
- if (this->used + 3 > this->buf.len)
- {
- increase(this);
- }
- memmove(this->buf.ptr + 3, this->buf.ptr, this->used);
-
- len = htonl(this->used);
- memcpy(this->buf.ptr, ((char*)&len) + 1, 3);
- this->used += 3;
-}
-
-METHOD(tls_writer_t, wrap32, void,
- private_tls_writer_t *this)
-{
- if (this->used + 4 > this->buf.len)
- {
- increase(this);
- }
- memmove(this->buf.ptr + 4, this->buf.ptr, this->used);
- htoun32(this->buf.ptr, this->used);
- this->used += 4;
-}
-
-METHOD(tls_writer_t, get_buf, chunk_t,
- private_tls_writer_t *this)
-{
- return chunk_create(this->buf.ptr, this->used);
-}
-
-METHOD(tls_writer_t, destroy, void,
- private_tls_writer_t *this)
-{
- free(this->buf.ptr);
- free(this);
-}
-
-/**
- * See header
- */
-tls_writer_t *tls_writer_create(u_int32_t bufsize)
-{
- private_tls_writer_t *this;
-
- INIT(this,
- .public = {
- .write_uint8 = _write_uint8,
- .write_uint16 = _write_uint16,
- .write_uint24 = _write_uint24,
- .write_uint32 = _write_uint32,
- .write_data = _write_data,
- .write_data8 = _write_data8,
- .write_data16 = _write_data16,
- .write_data24 = _write_data24,
- .write_data32 = _write_data32,
- .wrap8 = _wrap8,
- .wrap16 = _wrap16,
- .wrap24 = _wrap24,
- .wrap32 = _wrap32,
- .get_buf = _get_buf,
- .destroy = _destroy,
- },
- .increase = bufsize ? max(bufsize, 4) : 32,
- );
- if (bufsize)
- {
- this->buf = chunk_alloc(bufsize);
- }
-
- return &this->public;
-}
+++ /dev/null
-/*
- * Copyright (C) 2010 Martin Willi
- * Copyright (C) 2010 revosec AG
- *
- * 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. See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * 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 GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup tls_writer tls_writer
- * @{ @ingroup libtls
- */
-
-#ifndef TLS_WRITER_H_
-#define TLS_WRITER_H_
-
-typedef struct tls_writer_t tls_writer_t;
-
-#include <library.h>
-
-/**
- * TLS record generator.
- */
-struct tls_writer_t {
-
- /**
- * Append a 8-bit integer to the buffer.
- *
- * @param value value to append
- */
- void (*write_uint8)(tls_writer_t *this, u_int8_t value);
-
- /**
- * Append a 16-bit integer to the buffer.
- *
- * @param value value to append
- */
- void (*write_uint16)(tls_writer_t *this, u_int16_t value);
-
- /**
- * Append a 24-bit integer to the buffer.
- *
- * @param value value to append
- */
- void (*write_uint24)(tls_writer_t *this, u_int32_t value);
-
- /**
- * Append a 32-bit integer to the buffer.
- *
- * @param value value to append
- */
- void (*write_uint32)(tls_writer_t *this, u_int32_t value);
-
- /**
- * Append a chunk of data without a length header.
- *
- * @param value value to append
- */
- void (*write_data)(tls_writer_t *this, chunk_t value);
-
- /**
- * Append a chunk of data with a 8-bit length header.
- *
- * @param value value to append
- */
- void (*write_data8)(tls_writer_t *this, chunk_t value);
-
- /**
- * Append a chunk of data with a 16-bit length header.
- *
- * @param value value to append
- */
- void (*write_data16)(tls_writer_t *this, chunk_t value);
-
- /**
- * Append a chunk of data with a 24-bit length header.
- *
- * @param value value to append
- */
- void (*write_data24)(tls_writer_t *this, chunk_t value);
-
- /**
- * Append a chunk of data with a 32-bit length header.
- *
- * @param value value to append
- */
- void (*write_data32)(tls_writer_t *this, chunk_t value);
-
- /**
- * Prepend a 8-bit length header to existing data.
- */
- void (*wrap8)(tls_writer_t *this);
-
- /**
- * Prepend a 16-bit length header to existing data.
- */
- void (*wrap16)(tls_writer_t *this);
-
- /**
- * Prepend a 24-bit length header to existing data.
- */
- void (*wrap24)(tls_writer_t *this);
-
- /**
- * Prepend a 32-bit length header to existing data.
- */
- void (*wrap32)(tls_writer_t *this);
-
- /**
- * Get the encoded data buffer.
- *
- * @return chunk to internal buffer
- */
- chunk_t (*get_buf)(tls_writer_t *this);
-
- /**
- * Destroy a tls_writer_t.
- */
- void (*destroy)(tls_writer_t *this);
-};
-
-/**
- * Create a tls_writer instance.
- *
- * @param bufsize initially allocated buffer size
- */
-tls_writer_t *tls_writer_create(u_int32_t bufsize);
-
-#endif /** TLS_WRITER_H_ @}*/
projects / strongswan.git / commitdiff