1 files changed, 34 insertions, 43 deletions

diff --git a/src/libstrongswan/plugins/hmac/hmac_prf.c b/src/libstrongswan/plugins/hmac/hmac_prf.c
index cca6e9570..ca10612f9 100644
--- a/src/libstrongswan/plugins/hmac/hmac_prf.c
+++ b/src/libstrongswan/plugins/hmac/hmac_prf.c
@@ -36,51 +36,39 @@ struct private_hmac_prf_t {
 	hmac_t *hmac;
 };
 
-/**
- * Implementation of prf_t.get_bytes.
- */
-static void get_bytes(private_hmac_prf_t *this, chunk_t seed, u_int8_t *buffer)
+METHOD(prf_t, get_bytes, void,
+	private_hmac_prf_t *this, chunk_t seed, u_int8_t *buffer)
 {
 	this->hmac->get_mac(this->hmac, seed, buffer);
 }
 
-/**
- * Implementation of prf_t.allocate_bytes.
- */
-static void allocate_bytes(private_hmac_prf_t *this, chunk_t seed, chunk_t *chunk)
+METHOD(prf_t, allocate_bytes, void,
+	private_hmac_prf_t *this, chunk_t seed, chunk_t *chunk)
 {
 	this->hmac->allocate_mac(this->hmac, seed, chunk);
 }
 
-/**
- * Implementation of prf_t.get_block_size.
- */
-static size_t get_block_size(private_hmac_prf_t *this)
+METHOD(prf_t, get_block_size, size_t,
+	private_hmac_prf_t *this)
 {
 	return this->hmac->get_block_size(this->hmac);
 }
 
-/**
- * Implementation of prf_t.get_block_size.
- */
-static size_t get_key_size(private_hmac_prf_t *this)
+METHOD(prf_t, get_key_size, size_t,
+	private_hmac_prf_t *this)
 {
 	/* for HMAC prfs, IKEv2 uses block size as key size */
 	return this->hmac->get_block_size(this->hmac);
 }
 
-/**
- * Implementation of prf_t.set_key.
- */
-static void set_key(private_hmac_prf_t *this, chunk_t key)
+METHOD(prf_t, set_key, void,
+	private_hmac_prf_t *this, chunk_t key)
 {
 	this->hmac->set_key(this->hmac, key);
 }
 
-/**
- * Implementation of prf_t.destroy.
- */
-static void destroy(private_hmac_prf_t *this)
+METHOD(prf_t, destroy, void,
+	private_hmac_prf_t *this)
 {
 	this->hmac->destroy(this->hmac);
 	free(this);
@@ -92,44 +80,47 @@ static void destroy(private_hmac_prf_t *this)
 hmac_prf_t *hmac_prf_create(pseudo_random_function_t algo)
 {
 	private_hmac_prf_t *this;
-	hash_algorithm_t hash;
+	hmac_t *hmac;
 
 	switch (algo)
 	{
 		case PRF_HMAC_SHA1:
-			hash = HASH_SHA1;
+			hmac = hmac_create(HASH_SHA1);
 			break;
 		case PRF_HMAC_MD5:
-			hash = HASH_MD5;
+			hmac = hmac_create(HASH_MD5);
 			break;
 		case PRF_HMAC_SHA2_256:
-			hash = HASH_SHA256;
+			hmac = hmac_create(HASH_SHA256);
 			break;
 		case PRF_HMAC_SHA2_384:
-			hash = HASH_SHA384;
+			hmac = hmac_create(HASH_SHA384);
 			break;
 		case PRF_HMAC_SHA2_512:
-			hash = HASH_SHA512;
+			hmac = hmac_create(HASH_SHA512);
 			break;
 		default:
 			return NULL;
 	}
-
-	this = malloc_thing(private_hmac_prf_t);
-	this->hmac = hmac_create(hash);
-	if (this->hmac == NULL)
+	if (hmac == NULL)
 	{
-		free(this);
 		return NULL;
 	}
 
-	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.get_key_size = (size_t (*) (prf_t*))get_key_size;
-	this->public.prf_interface.set_key = (void (*) (prf_t *,chunk_t))set_key;
-	this->public.prf_interface.destroy = (void (*) (prf_t *))destroy;
-
-	return &(this->public);
+	INIT(this,
+		.public = {
+			.prf = {
+				.get_bytes = _get_bytes,
+				.allocate_bytes = _allocate_bytes,
+				.get_block_size = _get_block_size,
+				.get_key_size = _get_key_size,
+				.set_key = _set_key,
+				.destroy = _destroy,
+			},
+		},
+		.hmac = hmac,
+	);
+
+	return &this->public;
 }