1 files changed, 39 insertions, 73 deletions

diff --git a/Source/charon/encoding/payloads/ke_payload.c b/Source/charon/encoding/payloads/ke_payload.c
index d2181560d..9f1e7bdd3 100644
--- a/Source/charon/encoding/payloads/ke_payload.c
+++ b/Source/charon/encoding/payloads/ke_payload.c
@@ -1,11 +1,7 @@
 /**
  * @file ke_payload.c
  * 
- * @brief Declaration of the class ke_payload_t. 
- * 
- * An object of this type represents an IKEv2 KE-Payload.
- * 
- * See section 3.4 of RFC for details of this payload type.
+ * @brief Implementation of ke_payload_t.
  * 
  */
 
@@ -36,38 +32,38 @@
 typedef struct private_ke_payload_t private_ke_payload_t;
 
 /**
- * Private data of an ke_payload_t Object
+ * Private data of an ke_payload_t object.
  * 
  */
 struct private_ke_payload_t {
 	/**
-	 * public ke_payload_t interface
+	 * Public ke_payload_t interface.
 	 */
 	ke_payload_t public;
 	
 	/**
-	 * next payload type
+	 * Next payload type.
 	 */
 	u_int8_t  next_payload;
 
 	/**
-	 * Critical flag
+	 * Critical flag.
 	 */
 	bool critical;
 		
 	/**
-	 * Length of this payload
+	 * Length of this payload.
 	 */
 	u_int16_t payload_length;
 	
 	
 	/**
-	 * DH Group Number
+	 * DH Group Number.
 	 */
 	diffie_hellman_group_t dh_group_number;
 	
 	/**
-	 * Key Exchange Data of this KE payload
+	 * Key Exchange Data of this KE payload.
 	 */
 	chunk_t key_exchange_data;
 	
@@ -75,14 +71,12 @@ struct private_ke_payload_t {
 	 * @brief Computes the length of this payload.
 	 *
 	 * @param this 	calling private_ke_payload_t object
-	 * @return 		
-	 * 				SUCCESS in any case
 	 */
-	status_t (*compute_length) (private_ke_payload_t *this);
+	void (*compute_length) (private_ke_payload_t *this);
 };
 
 /**
- * Encoding rules to parse or generate a IKEv2-KE Payload
+ * Encoding rules to parse or generate a IKEv2-KE Payload.
  * 
  * The defined offsets are the positions in a object of type 
  * private_ke_payload_t.
@@ -126,8 +120,7 @@ encoding_rule_t ke_payload_encodings[] = {
 */
 
 /**
- * Implements payload_t's verify function.
- * See #payload_s.verify for description.
+ * Implementation of payload_t.verify.
  */
 static status_t verify(private_ke_payload_t *this)
 {
@@ -142,34 +135,28 @@ static status_t verify(private_ke_payload_t *this)
 }
 
 /**
- * Implements payload_t's and ke_payload_t's destroy function.
- * See #payload_s.destroy or ke_payload_s.destroy for description.
+ * Implementation of payload_t.destroy.
  */
-static status_t destroy(private_ke_payload_t *this)
+static void destroy(private_ke_payload_t *this)
 {
 	if (this->key_exchange_data.ptr != NULL)
 	{
 		allocator_free(this->key_exchange_data.ptr);
 	}
 	allocator_free(this);
-	return SUCCESS;
 }
 
 /**
- * Implements payload_t's get_encoding_rules function.
- * See #payload_s.get_encoding_rules for description.
+ * Implementation of payload_t.get_encoding_rules.
  */
-static status_t get_encoding_rules(private_ke_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
+static void get_encoding_rules(private_ke_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
 {
 	*rules = ke_payload_encodings;
 	*rule_count = sizeof(ke_payload_encodings) / sizeof(encoding_rule_t);
-	
-	return SUCCESS;
 }
 
 /**
- * Implements payload_t's get_type function.
- * See #payload_s.get_type for description.
+ * Implementation of payload_t.get_type.
  */
 static payload_type_t get_type(private_ke_payload_t *this)
 {
@@ -177,8 +164,7 @@ static payload_type_t get_type(private_ke_payload_t *this)
 }
 
 /**
- * Implements payload_t's get_next_type function.
- * See #payload_s.get_next_type for description.
+ * Implementation of payload_t.get_next_type.
  */
 static payload_type_t get_next_type(private_ke_payload_t *this)
 {
@@ -186,18 +172,15 @@ static payload_type_t get_next_type(private_ke_payload_t *this)
 }
 
 /**
- * Implements payload_t's set_next_type function.
- * See #payload_s.set_next_type for description.
+ * Implementation of payload_t.set_next_type.
  */
-static status_t set_next_type(private_ke_payload_t *this,payload_type_t type)
+static void set_next_type(private_ke_payload_t *this,payload_type_t type)
 {
 	this->next_payload = type;
-	return SUCCESS;
 }
 
 /**
- * Implements payload_t's get_length function.
- * See #payload_s.get_length for description.
+ * Implementation of payload_t.get_length.
  */
 static size_t get_length(private_ke_payload_t *this)
 {
@@ -206,37 +189,31 @@ static size_t get_length(private_ke_payload_t *this)
 }
 
 /**
- * Implements private_ke_payload_t's compute_length function.
- * See #private_ke_payload_s.compute_length for description.
+ * Implementation of private_ke_payload_t.compute_length.
  */
-static status_t compute_length (private_ke_payload_t *this)
+static void compute_length (private_ke_payload_t *this)
 {
 	size_t length = KE_PAYLOAD_HEADER_LENGTH;
 	if (this->key_exchange_data.ptr != NULL)
 	{
 		length += this->key_exchange_data.len;
-	}
-	
+	}	
 	this->payload_length = length;
-		
-	return SUCCESS;
 }
 
 
 /**
- * Implements ke_payload_t's get_key_exchange_data function.
- * See #ke_payload_t.get_key_exchange_data for description.
+ * Implementation of ke_payload_t.get_key_exchange_data.
  */
-chunk_t get_key_exchange_data(private_ke_payload_t *this)
+static chunk_t get_key_exchange_data(private_ke_payload_t *this)
 {
 	return (this->key_exchange_data);
 }
 
 /**
- * Implements ke_payload_t's set_key_exchange_data function.
- * See #ke_payload_t.set_key_exchange_data for description.
+ * Implementation of ke_payload_t.set_key_exchange_data.
  */
-status_t set_key_exchange_data(private_ke_payload_t *this, chunk_t key_exchange_data)
+static void set_key_exchange_data(private_ke_payload_t *this, chunk_t key_exchange_data)
 {
 	/* destroy existing data first */
 	if (this->key_exchange_data.ptr != NULL)
@@ -249,33 +226,25 @@ status_t set_key_exchange_data(private_ke_payload_t *this, chunk_t key_exchange_
 	}
 	
 	this->key_exchange_data.ptr = allocator_clone_bytes(key_exchange_data.ptr,key_exchange_data.len);
-	if (this->key_exchange_data.ptr == NULL)
-	{
-		return OUT_OF_RES;
-	}
+
 	this->key_exchange_data.len = key_exchange_data.len;
 	this->compute_length(this);
-	
-	return SUCCESS;
 }
 
 /**
- * Implements ke_payload_t's get_dh_group_number function.
- * See #ke_payload_t.get_dh_group_number for description.
+ * Implementation of ke_payload_t.get_dh_group_number.
  */
-diffie_hellman_group_t get_dh_group_number(private_ke_payload_t *this)
+static diffie_hellman_group_t get_dh_group_number(private_ke_payload_t *this)
 {
 	return this->dh_group_number;
 }
 
 /**
- * Implements ke_payload_t's set_dh_group_number function.
- * See #ke_payload_t.set_dh_group_number for description.
+ * Implementation of ke_payload_t.set_dh_group_number.
  */
-status_t set_dh_group_number(private_ke_payload_t *this, diffie_hellman_group_t dh_group_number)
+static void set_dh_group_number(private_ke_payload_t *this, diffie_hellman_group_t dh_group_number)
 {
 	this->dh_group_number = dh_group_number;
-	return SUCCESS;
 }
 
 /*
@@ -284,25 +253,22 @@ status_t set_dh_group_number(private_ke_payload_t *this, diffie_hellman_group_t
 ke_payload_t *ke_payload_create()
 {
 	private_ke_payload_t *this = allocator_alloc_thing(private_ke_payload_t);
-	if (this == NULL)
-	{
-		return NULL;	
-	}	
+
 	/* interface functions */
 	this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;
-	this->public.payload_interface.get_encoding_rules = (status_t (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules;
+	this->public.payload_interface.get_encoding_rules = (void (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules;
 	this->public.payload_interface.get_length = (size_t (*) (payload_t *)) get_length;
 	this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t *)) get_next_type;
-	this->public.payload_interface.set_next_type = (status_t (*) (payload_t *,payload_type_t)) set_next_type;
+	this->public.payload_interface.set_next_type = (void (*) (payload_t *,payload_type_t)) set_next_type;
 	this->public.payload_interface.get_type = (payload_type_t (*) (payload_t *)) get_type;
-	this->public.payload_interface.destroy = (status_t (*) (payload_t *))destroy;
+	this->public.payload_interface.destroy = (void (*) (payload_t *))destroy;
 
 	/* public functions */
 	this->public.get_key_exchange_data = (chunk_t (*) (ke_payload_t *)) get_key_exchange_data;
-	this->public.set_key_exchange_data = (status_t (*) (ke_payload_t *,chunk_t)) set_key_exchange_data;
+	this->public.set_key_exchange_data = (void (*) (ke_payload_t *,chunk_t)) set_key_exchange_data;
 	this->public.get_dh_group_number = (diffie_hellman_group_t (*) (ke_payload_t *)) get_dh_group_number;
-	this->public.set_dh_group_number =(status_t (*) (ke_payload_t *,diffie_hellman_group_t)) set_dh_group_number;
-	this->public.destroy = (status_t (*) (ke_payload_t *)) destroy;
+	this->public.set_dh_group_number =(void (*) (ke_payload_t *,diffie_hellman_group_t)) set_dh_group_number;
+	this->public.destroy = (void (*) (ke_payload_t *)) destroy;
 	
 	/* private functions */
 	this->compute_length = compute_length;