diff options
Diffstat (limited to 'Source/charon/transforms')
| -rw-r--r-- | Source/charon/transforms/prfs/Makefile.prfs | 4 | ||||
| -rw-r--r-- | Source/charon/transforms/prfs/hmac_prf.c (renamed from Source/charon/transforms/prfs/prf_hmac.c) | 26 | ||||
| -rw-r--r-- | Source/charon/transforms/prfs/hmac_prf.h (renamed from Source/charon/transforms/prfs/prf_hmac.h) | 16 | ||||
| -rw-r--r-- | Source/charon/transforms/prfs/prf.c | 6 | ||||
| -rw-r--r-- | Source/charon/transforms/signers/hmac_signer.c | 4 |
5 files changed, 28 insertions, 28 deletions
diff --git a/Source/charon/transforms/prfs/Makefile.prfs b/Source/charon/transforms/prfs/Makefile.prfs index 1934361ce..378d8bd0b 100644 --- a/Source/charon/transforms/prfs/Makefile.prfs +++ b/Source/charon/transforms/prfs/Makefile.prfs @@ -18,6 +18,6 @@ OBJS+= $(BUILD_DIR)prf.o $(BUILD_DIR)prf.o : $(PRFS_DIR)prf.c $(PRFS_DIR)prf.h $(CC) $(CFLAGS) -c -o $@ $< -OBJS+= $(BUILD_DIR)prf_hmac.o -$(BUILD_DIR)prf_hmac.o : $(PRFS_DIR)prf_hmac.c $(PRFS_DIR)prf_hmac.h +OBJS+= $(BUILD_DIR)hmac_prf.o +$(BUILD_DIR)hmac_prf.o : $(PRFS_DIR)hmac_prf.c $(PRFS_DIR)hmac_prf.h $(CC) $(CFLAGS) -c -o $@ $< diff --git a/Source/charon/transforms/prfs/prf_hmac.c b/Source/charon/transforms/prfs/hmac_prf.c index 96e89ef80..17f60650c 100644 --- a/Source/charon/transforms/prfs/prf_hmac.c +++ b/Source/charon/transforms/prfs/hmac_prf.c @@ -1,7 +1,7 @@ /** - * @file prf_hmac.c + * @file hmac_prf.c * - * @brief Implementation for prf_hmac_t. + * @brief Implementation for hmac_prf_t. * */ @@ -20,18 +20,18 @@ * for more details. */ -#include "prf_hmac.h" +#include "hmac_prf.h" #include <utils/allocator.h> #include <transforms/hmac.h> -typedef struct private_prf_hmac_t private_prf_hmac_t; +typedef struct private_hmac_prf_t private_hmac_prf_t; -struct private_prf_hmac_t { +struct private_hmac_prf_t { /** * public interface for this prf */ - prf_hmac_t public; + hmac_prf_t public; /** * hmac to use for generation @@ -42,7 +42,7 @@ struct private_prf_hmac_t { /** * implementation of prf_t.get_bytes */ -static status_t get_bytes(private_prf_hmac_t *this, chunk_t seed, u_int8_t *buffer) +static status_t get_bytes(private_hmac_prf_t *this, chunk_t seed, u_int8_t *buffer) { return this->hmac->get_mac(this->hmac, seed, buffer); } @@ -50,7 +50,7 @@ static status_t get_bytes(private_prf_hmac_t *this, chunk_t seed, u_int8_t *buff /** * implementation of prf_t.allocate_bytes */ -static status_t allocate_bytes(private_prf_hmac_t *this, chunk_t seed, chunk_t *chunk) +static status_t allocate_bytes(private_hmac_prf_t *this, chunk_t seed, chunk_t *chunk) { return this->hmac->allocate_mac(this->hmac, seed, chunk); } @@ -58,7 +58,7 @@ static status_t allocate_bytes(private_prf_hmac_t *this, chunk_t seed, chunk_t * /** * implementation of prf_t.get_block_size */ -static size_t get_block_size(private_prf_hmac_t *this) +static size_t get_block_size(private_hmac_prf_t *this) { return this->hmac->get_block_size(this->hmac); } @@ -66,7 +66,7 @@ static size_t get_block_size(private_prf_hmac_t *this) /** * implementation of prf_t.set_key */ -static status_t set_key(private_prf_hmac_t *this, chunk_t key) +static status_t set_key(private_hmac_prf_t *this, chunk_t key) { this->hmac->set_key(this->hmac, key); return SUCCESS; @@ -75,7 +75,7 @@ static status_t set_key(private_prf_hmac_t *this, chunk_t key) /** * implementation of prf_t.destroy */ -static status_t destroy(private_prf_hmac_t *this) +static status_t destroy(private_hmac_prf_t *this) { allocator_free(this); this->hmac->destroy(this->hmac); @@ -85,9 +85,9 @@ static status_t destroy(private_prf_hmac_t *this) /* * Described in header */ -prf_hmac_t *prf_hmac_create(hash_algorithm_t hash_algorithm) +hmac_prf_t *hmac_prf_create(hash_algorithm_t hash_algorithm) { - private_prf_hmac_t *this = allocator_alloc_thing(private_prf_hmac_t); + private_hmac_prf_t *this = allocator_alloc_thing(private_hmac_prf_t); if (this == NULL) { diff --git a/Source/charon/transforms/prfs/prf_hmac.h b/Source/charon/transforms/prfs/hmac_prf.h index 25ffd73ff..d1b741d04 100644 --- a/Source/charon/transforms/prfs/prf_hmac.h +++ b/Source/charon/transforms/prfs/hmac_prf.h @@ -1,7 +1,7 @@ /** - * @file prf_hmac.h + * @file hmac_prf.h * - * @brief Interface for prf_hmac_t. + * @brief Interface for hmac_prf_t. * */ @@ -27,7 +27,7 @@ #include <transforms/prfs/prf.h> #include <transforms/hashers/hasher.h> -typedef struct prf_hmac_t prf_hmac_t; +typedef struct hmac_prf_t hmac_prf_t; /** * @brief Implementation of prf_t interface using the @@ -38,24 +38,24 @@ typedef struct prf_hmac_t prf_hmac_t; * * @ingroup prfs */ -struct prf_hmac_t { +struct hmac_prf_t { /** - * Generic prf_t interface for this prf_hmac_t class. + * Generic prf_t interface for this hmac_prf_t class. */ prf_t prf_interface; }; /** - * @brief Creates a new prf_hmac_t object + * @brief Creates a new hmac_prf_t object * * @param hash_algorithm hmac's hash algorithm * @return - * - prf_hmac_t if successfully + * - hmac_prf_t if successfully * - NULL if out of ressources * * @ingroup prfs */ -prf_hmac_t *prf_hmac_create(hash_algorithm_t hash_algorithm); +hmac_prf_t *hmac_prf_create(hash_algorithm_t hash_algorithm); #endif /*PRF_HMAC_SHA1_H_*/ diff --git a/Source/charon/transforms/prfs/prf.c b/Source/charon/transforms/prfs/prf.c index e1cc13990..732c91c51 100644 --- a/Source/charon/transforms/prfs/prf.c +++ b/Source/charon/transforms/prfs/prf.c @@ -24,7 +24,7 @@ #include "prf.h" #include <transforms/hashers/hasher.h> -#include <transforms/prfs/prf_hmac.h> +#include <transforms/prfs/hmac_prf.h> /** @@ -49,11 +49,11 @@ prf_t *prf_create(pseudo_random_function_t pseudo_random_function) { case PRF_HMAC_SHA1: { - return (prf_t*)prf_hmac_create(HASH_SHA1); + return (prf_t*)hmac_prf_create(HASH_SHA1); } case PRF_HMAC_MD5: { - return (prf_t*)prf_hmac_create(HASH_MD5); + return (prf_t*)hmac_prf_create(HASH_MD5); } case PRF_HMAC_TIGER: case PRF_AES128_CBC: diff --git a/Source/charon/transforms/signers/hmac_signer.c b/Source/charon/transforms/signers/hmac_signer.c index caf2b9e68..c548bfb15 100644 --- a/Source/charon/transforms/signers/hmac_signer.c +++ b/Source/charon/transforms/signers/hmac_signer.c @@ -23,7 +23,7 @@ #include "hmac_signer.h" #include <utils/allocator.h> -#include <transforms/prfs/prf_hmac.h> +#include <transforms/prfs/hmac_prf.h> /** * This class represents a hmac signer with 12 byte (96 bit) output @@ -155,7 +155,7 @@ hmac_signer_t *hmac_signer_create(hash_algorithm_t hash_algoritm) return NULL; } - this->hmac_prf = (prf_t *) prf_hmac_create(hash_algoritm); + this->hmac_prf = (prf_t *) hmac_prf_create(hash_algoritm); if (this->hmac_prf == NULL) { |