5 files changed, 251 insertions, 3 deletions

diff --git a/src/libimcv/generic/generic_attr_bool.c b/src/libimcv/generic/generic_attr_bool.c
index eca077a6e..3f570d9f8 100644
--- a/src/libimcv/generic/generic_attr_bool.c
+++ b/src/libimcv/generic/generic_attr_bool.c
@@ -130,7 +130,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 	{
 		return NEED_MORE;
 	}
-    pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
+	pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
 													  this->type.vendor_id);
 
 	if (this->value.len != ATTR_BOOL_SIZE)
diff --git a/src/libimcv/generic/generic_attr_chunk.c b/src/libimcv/generic/generic_attr_chunk.c
new file mode 100644
index 000000000..98a539987
--- /dev/null
+++ b/src/libimcv/generic/generic_attr_chunk.c
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2015 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * 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 "generic_attr_chunk.h"
+
+#include <imcv.h>
+#include <pen/pen.h>
+#include <utils/debug.h>
+
+typedef struct private_generic_attr_chunk_t private_generic_attr_chunk_t;
+
+/**
+ * Private data of an generic_attr_chunk_t object.
+ */
+struct private_generic_attr_chunk_t {
+
+	/**
+	 * Public members of generic_attr_chunk_t
+	 */
+	generic_attr_chunk_t public;
+
+	/**
+	 * Vendor-specific attribute type
+	 */
+	pen_type_t type;
+
+	/**
+	 * Length of attribute value
+	 */
+	size_t length;
+
+	/**
+	 * Fixed size of attribute value, set to 0 if dynamic
+	 */
+	size_t size;
+
+	/**
+	 * Attribute value or segment
+	 */
+	chunk_t value;
+
+	/**
+	 * Noskip flag
+	 */
+	bool noskip_flag;
+
+	/**
+	 * Reference count
+	 */
+	refcount_t ref;
+};
+
+METHOD(pa_tnc_attr_t, get_type, pen_type_t,
+	private_generic_attr_chunk_t *this)
+{
+	return this->type;
+}
+
+METHOD(pa_tnc_attr_t, get_value, chunk_t,
+	private_generic_attr_chunk_t *this)
+{
+	return this->value;
+}
+
+METHOD(pa_tnc_attr_t, get_noskip_flag, bool,
+	private_generic_attr_chunk_t *this)
+{
+	return this->noskip_flag;
+}
+
+METHOD(pa_tnc_attr_t, set_noskip_flag,void,
+	private_generic_attr_chunk_t *this, bool noskip)
+{
+	this->noskip_flag = noskip;
+}
+
+METHOD(pa_tnc_attr_t, build, void,
+	private_generic_attr_chunk_t *this)
+{
+	return;
+}
+
+METHOD(pa_tnc_attr_t, process, status_t,
+	private_generic_attr_chunk_t *this, u_int32_t *offset)
+{
+	enum_name_t *pa_attr_names;
+	*offset = 0;
+
+	if (this->value.len < this->length)
+	{
+		return NEED_MORE;
+	}
+	pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
+													  this->type.vendor_id);
+
+	if ((this->size == 0 && this->value.len > this->length) ||
+		(this->size != 0 && this->value.len != this->size))
+	{
+		DBG1(DBG_TNC, "inconsistent length of %N/%N string attribute",
+			 pen_names, this->type.vendor_id, pa_attr_names, this->type.type);
+		return FAILED;
+	}
+
+	return SUCCESS;
+}
+
+METHOD(pa_tnc_attr_t, add_segment, void,
+	private_generic_attr_chunk_t *this, chunk_t segment)
+{
+	this->value = chunk_cat("mc", this->value, segment);
+}
+
+METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
+	private_generic_attr_chunk_t *this)
+{
+	ref_get(&this->ref);
+	return &this->public.pa_tnc_attribute;
+}
+
+METHOD(pa_tnc_attr_t, destroy, void,
+	private_generic_attr_chunk_t *this)
+{
+	if (ref_put(&this->ref))
+	{
+		free(this->value.ptr);
+		free(this);
+	}
+}
+
+/**
+ * Described in header.
+ */
+pa_tnc_attr_t *generic_attr_chunk_create_from_data(size_t length, chunk_t value,
+												   size_t size, pen_type_t type)
+{
+	private_generic_attr_chunk_t *this;
+
+	INIT(this,
+		.public = {
+			.pa_tnc_attribute = {
+				.get_type = _get_type,
+				.get_value = _get_value,
+				.get_noskip_flag = _get_noskip_flag,
+				.set_noskip_flag = _set_noskip_flag,
+				.build = _build,
+				.process = _process,
+				.add_segment = _add_segment,
+				.get_ref = _get_ref,
+				.destroy = _destroy,
+			},
+		},
+		.type = type,
+		.length = length,
+		.size = size,
+		.value = chunk_clone(value),
+		.ref = 1,
+	);
+
+	return &this->public.pa_tnc_attribute;
+}
+
+/**
+ * Described in header.
+ */
+pa_tnc_attr_t *generic_attr_chunk_create(chunk_t value, pen_type_t type)
+{
+	return generic_attr_chunk_create_from_data(value.len, value,
+											   value.len, type);
+}
+
diff --git a/src/libimcv/generic/generic_attr_chunk.h b/src/libimcv/generic/generic_attr_chunk.h
new file mode 100644
index 000000000..a9b3a62de
--- /dev/null
+++ b/src/libimcv/generic/generic_attr_chunk.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2015 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * 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 generic_attr_chunk generic_attr_chunk
+ * @{ @ingroup generic_attr
+ */
+
+#ifndef GENERIC_ATTR_CHUNK_H_
+#define GENERIC_ATTR_CHUNK_H_
+
+typedef struct generic_attr_chunk_t generic_attr_chunk_t;
+
+#include <pen/pen.h>
+#include "pa_tnc/pa_tnc_attr.h"
+
+/**
+ * Class implementing a generic PA-TNC attribute containing a possibly
+ * binary string with either a fixed or variable size
+ */
+struct generic_attr_chunk_t {
+
+	/**
+	 * Public PA-TNC attribute interface
+	 */
+	pa_tnc_attr_t pa_tnc_attribute;
+};
+
+/**
+ * Creates a generic_attr_chunk_t object
+ *
+ * @param string			Non-nul terminated string
+ * @param type				Vendor ID / Attribute Type
+ */
+pa_tnc_attr_t* generic_attr_chunk_create(chunk_t string, pen_type_t type);
+
+/**
+ * Creates an generic_attr_chunk_t object from received data
+ *
+ * @param length			Total length of attribute value
+ * @param value				Unparsed attribute value (might be a segment)
+ * @param size				size in bytes if fixed array or 0 if dynamic size
+ * @param type				Vendor ID / Attribute Type
+ */
+pa_tnc_attr_t* generic_attr_chunk_create_from_data(size_t length, chunk_t value,
+												   size_t size, pen_type_t type);
+
+#endif /** GENERIC_ATTR_CHUNK_H_ @}*/
diff --git a/src/libimcv/generic/generic_attr_string.c b/src/libimcv/generic/generic_attr_string.c
index e14e8d2aa..e63c0126a 100644
--- a/src/libimcv/generic/generic_attr_string.c
+++ b/src/libimcv/generic/generic_attr_string.c
@@ -98,8 +98,14 @@ METHOD(pa_tnc_attr_t, process, status_t,
 	{
 		return NEED_MORE;
 	}
-    pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
+	pa_attr_names = imcv_pa_tnc_attributes->get_names(imcv_pa_tnc_attributes,
 													  this->type.vendor_id);
+	if (this->value.len > this->length)
+	{
+		DBG1(DBG_TNC, "inconsistent length of %N/%N string attribute",
+			 pen_names, this->type.vendor_id, pa_attr_names, this->type.type);
+		return FAILED;
+	}
 
 	pos = memchr(this->value.ptr, '\0', this->value.len);
 	if (pos)
diff --git a/src/libimcv/generic/generic_attr_string.h b/src/libimcv/generic/generic_attr_string.h
index c7210297d..d830ab4aa 100644
--- a/src/libimcv/generic/generic_attr_string.h
+++ b/src/libimcv/generic/generic_attr_string.h
@@ -28,7 +28,7 @@ typedef struct generic_attr_string_t generic_attr_string_t;
 
 /**
  * Class implementing a generic PA-TNC attribute containing a non-nul
- * terminated string 
+ * terminated printable string
  */
 struct generic_attr_string_t {