1 files changed, 16 insertions, 62 deletions
diff --git a/src/libstrongswan/plugins/hmac/hmac.h b/src/libstrongswan/plugins/hmac/hmac.h
index 1ed041596..bf66dd4aa 100644
--- a/src/libstrongswan/plugins/hmac/hmac.h
+++ b/src/libstrongswan/plugins/hmac/hmac.h
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Martin Willi
- * Copyright (C) 2005 Jan Hutter
+ * Copyright (C) 2012 Tobias Brunner
  * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -15,79 +14,34 @@
  */
 
 /**
- * @defgroup hmac hmac
+ * Implements the message authentication algorithm described in RFC2104.
+ *
+ * It uses a hash function, which must be implemented as a hasher_t class.
+ *
+ * @defgroup hmac_mac mac
  * @{ @ingroup hmac_p
  */
 
 #ifndef HMAC_H_
 #define HMAC_H_
 
-typedef struct hmac_t hmac_t;
-
-#include <crypto/hashers/hasher.h>
+#include <crypto/prfs/prf.h>
+#include <crypto/signers/signer.h>
 
 /**
- * Message authentication using hash functions.
+ * Creates a new prf_t object based on an HMAC.
  *
- * This class implements the message authentication algorithm
- * described in RFC2104. It uses a hash function, which must
- * be implemented as a hasher_t class.
+ * @param algo		algorithm to implement
+ * @return			prf_t object, NULL if not supported
  */
-struct hmac_t {
-	/**
-	 * Generate message authentication code.
-	 *
-	 * If buffer is NULL, no result is given back. A next call will
-	 * append the data to already supplied data. If buffer is not NULL,
-	 * the mac of all apended data is calculated, returned and the
-	 * state of the hmac_t is reseted.
-	 *
-	 * @param data		chunk of data to authenticate
-	 * @param buffer	pointer where the generated bytes will be written
-	 */
-	void (*get_mac) (hmac_t *this, chunk_t data, u_int8_t *buffer);
-
-	/**
-	 * Generates message authentication code and allocate space for them.
-	 *
-	 * If chunk is NULL, no result is given back. A next call will
-	 * append the data to already supplied. If chunk is not NULL,
-	 * the mac of all apended data is calculated, returned and the
-	 * state of the hmac_t reset;
-	 *
-	 * @param data		chunk of data to authenticate
-	 * @param chunk		chunk which will hold generated bytes
-	 */
-	void (*allocate_mac) (hmac_t *this, chunk_t data, chunk_t *chunk);
-
-	/**
-	 * Get the block size of this hmac_t object.
-	 *
-	 * @return			block size in bytes
-	 */
-	size_t (*get_block_size) (hmac_t *this);
-
-	/**
-	 * Set the key for this hmac_t object.
-	 *
-	 * Any key length is accepted.
-	 *
-	 * @param key		key to set
-	 */
-	void (*set_key) (hmac_t *this, chunk_t key);
-
-	/**
-	 * Destroys a hmac_t object.
-	 */
-	void (*destroy) (hmac_t *this);
-};
+prf_t *hmac_prf_create(pseudo_random_function_t algo);
 
 /**
- * Creates a new hmac_t object.
+ * Creates a new signer_t object based on an HMAC.
  *
- * @param hash_algorithm	hash algorithm to use
- * @return					hmac_t object, NULL if not supported
+ * @param algo		algorithm to implement
+ * @return			signer_t, NULL if not supported
  */
-hmac_t *hmac_create(hash_algorithm_t hash_algorithm);
+signer_t *hmac_signer_create(integrity_algorithm_t algo);
 
 #endif /** HMAC_H_ @}*/