3 files changed, 18 insertions, 34 deletions

diff --git a/Source/charon/transforms/prfs/hmac_prf.c b/Source/charon/transforms/prfs/hmac_prf.c
index 17f60650c..07a3cd854 100644
--- a/Source/charon/transforms/prfs/hmac_prf.c
+++ b/Source/charon/transforms/prfs/hmac_prf.c
@@ -42,17 +42,17 @@ struct private_hmac_prf_t {
 /**
  * implementation of prf_t.get_bytes
  */
-static status_t get_bytes(private_hmac_prf_t *this, chunk_t seed, u_int8_t *buffer)
+static void get_bytes(private_hmac_prf_t *this, chunk_t seed, u_int8_t *buffer)
 {
-	return this->hmac->get_mac(this->hmac, seed, buffer);
+	this->hmac->get_mac(this->hmac, seed, buffer);
 }
 
 /**
  * implementation of prf_t.allocate_bytes
  */
-static status_t allocate_bytes(private_hmac_prf_t *this, chunk_t seed, chunk_t *chunk)
+static void allocate_bytes(private_hmac_prf_t *this, chunk_t seed, chunk_t *chunk)
 {
-	return this->hmac->allocate_mac(this->hmac, seed, chunk);
+	this->hmac->allocate_mac(this->hmac, seed, chunk);
 }
 
 /**
@@ -66,20 +66,18 @@ static size_t get_block_size(private_hmac_prf_t *this)
 /**
  * implementation of prf_t.set_key
  */
-static status_t set_key(private_hmac_prf_t *this, chunk_t key)
+static void set_key(private_hmac_prf_t *this, chunk_t key)
 {
 	this->hmac->set_key(this->hmac, key);
-	return SUCCESS;
 }
 
 /**
  * implementation of prf_t.destroy
  */
-static status_t destroy(private_hmac_prf_t *this)
+static void destroy(private_hmac_prf_t *this)
 {
 	allocator_free(this);
 	this->hmac->destroy(this->hmac);
-	return SUCCESS;
 }
 
 /*
@@ -89,16 +87,11 @@ hmac_prf_t *hmac_prf_create(hash_algorithm_t hash_algorithm)
 {
 	private_hmac_prf_t *this = allocator_alloc_thing(private_hmac_prf_t);
 	
-	if (this == NULL)
-	{
-		return NULL;	
-	}
-	
-	this->public.prf_interface.get_bytes = (status_t (*) (prf_t *,chunk_t,u_int8_t*))get_bytes;
-	this->public.prf_interface.allocate_bytes = (status_t (*) (prf_t*,chunk_t,chunk_t*))allocate_bytes;
+	this->public.prf_interface.get_bytes = (void (*) (prf_t *,chunk_t,u_int8_t*))get_bytes;
+	this->public.prf_interface.allocate_bytes = (void (*) (prf_t*,chunk_t,chunk_t*))allocate_bytes;
 	this->public.prf_interface.get_block_size = (size_t (*) (prf_t*))get_block_size;
-	this->public.prf_interface.set_key = (status_t (*) (prf_t *,chunk_t))set_key;
-	this->public.prf_interface.destroy = (status_t (*) (prf_t *))destroy;
+	this->public.prf_interface.set_key = (void (*) (prf_t *,chunk_t))set_key;
+	this->public.prf_interface.destroy = (void (*) (prf_t *))destroy;
 	
 	this->hmac = hmac_create(hash_algorithm);
 	if (this->hmac == NULL)
diff --git a/Source/charon/transforms/prfs/hmac_prf.h b/Source/charon/transforms/prfs/hmac_prf.h
index d1b741d04..70605ff0e 100644
--- a/Source/charon/transforms/prfs/hmac_prf.h
+++ b/Source/charon/transforms/prfs/hmac_prf.h
@@ -49,10 +49,10 @@ struct hmac_prf_t {
 /**
  * @brief Creates a new hmac_prf_t object
  * 
- * @param hash_algorithm			hmac's hash algorithm
+ * @param hash_algorithm	hmac's hash algorithm
  * @return
- * 									- hmac_prf_t if successfully
- * 									- NULL if out of ressources
+ * 							- hmac_prf_t if successfully
+ * 							- NULL if hash not supported
  * 
  * @ingroup prfs
  */
diff --git a/Source/charon/transforms/prfs/prf.h b/Source/charon/transforms/prfs/prf.h
index 9a79c6047..470556dc8 100644
--- a/Source/charon/transforms/prfs/prf.h
+++ b/Source/charon/transforms/prfs/prf.h
@@ -59,10 +59,8 @@ struct prf_t {
 	 * @param this			calling prf
 	 * @param seed			a chunk containing the seed for the next bytes
 	 * @param[out] buffer	pointer where the generated bytes will be written
-	 * @return				
-	 * 						- SUCCESS in any case
 	 */
-	status_t (*get_bytes) (prf_t *this, chunk_t seed, u_int8_t *buffer);
+	void (*get_bytes) (prf_t *this, chunk_t seed, u_int8_t *buffer);
 	
 	/**
 	 * @brief generates pseudo random bytes and allocate space for them.
@@ -70,11 +68,8 @@ struct prf_t {
 	 * @param this			calling prf
 	 * @param seed			a chunk containing the seed for the next bytes
 	 * @param[out] chunk	chunk which will hold generated bytes
-	 * @return				
-	 * 						- SUCCESS in any case
-	 * 						- OUT_OF_RES if space could not be allocated
 	 */
-	status_t (*allocate_bytes) (prf_t *this, chunk_t seed, chunk_t *chunk);
+	void (*allocate_bytes) (prf_t *this, chunk_t seed, chunk_t *chunk);
 	
 	/**
 	 * @brief get the block size of this prf.
@@ -89,19 +84,15 @@ struct prf_t {
 	 * 
 	 * @param this			calling prf
 	 * @param key			key to set
-	 * @return				
-	 * 						- SUCCESS in any case
 	 */
-	status_t (*set_key) (prf_t *this, chunk_t key);
+	void (*set_key) (prf_t *this, chunk_t key);
 	
 	/**
 	 * @brief Destroys a prf object..
 	 *
 	 * @param this 			prf_t object to destroy
-	 * @return 		
-	 * 						- SUCCESS in any case
 	 */
-	status_t (*destroy) (prf_t *this);
+	void (*destroy) (prf_t *this);
 };
 
 /**
@@ -110,7 +101,7 @@ struct prf_t {
  * @param pseudo_random_function	Algorithm to use
  * @return
  * 									- prf_t if successfully
- * 									- NULL if out of ressources or prf not supported
+ * 									- NULL if prf not supported
  *
  * @ingroup prfs
  */