5 files changed, 18 insertions, 18 deletions
diff --git a/Source/charon/transforms/hashers/hasher.h b/Source/charon/transforms/hashers/hasher.h
index a20ec6813..8b4699a3e 100644
--- a/Source/charon/transforms/hashers/hasher.h
+++ b/Source/charon/transforms/hashers/hasher.h
@@ -26,23 +26,23 @@
 
 #include <types.h>
 
+typedef enum hash_algorithm_t hash_algorithm_t;
+
 /**
  * algorithms to use for hashing
  */
-typedef enum hash_algorithm_e hash_algorithm_t;
-
-enum hash_algorithm_e {
+enum hash_algorithm_t {
 	HASH_SHA1,
 	HASH_MD5
 };
 
 
+typedef struct hasher_t hasher_t;
+
 /**
  * Object representing a hasher
  */
-typedef struct hasher_s hasher_t;
-
-struct hasher_s {
+struct hasher_t {
 	/**
 	 * @brief hash data and write it in the buffer
 	 * 
diff --git a/Source/charon/transforms/hashers/hasher_md5.c b/Source/charon/transforms/hashers/hasher_md5.c
index f671bef6c..bfdd96785 100644
--- a/Source/charon/transforms/hashers/hasher_md5.c
+++ b/Source/charon/transforms/hashers/hasher_md5.c
@@ -98,12 +98,12 @@ Rotation is separate from addition to prevent recomputation.
 
 
 
+typedef struct private_hasher_md5_t private_hasher_md5_t;
+
 /**
  * private data structure with hasing context
  */
-typedef struct private_hasher_md5_s private_hasher_md5_t;
-
-struct private_hasher_md5_s {
+struct private_hasher_md5_t {
 	/**
 	 * public interface for this hasher
 	 */
diff --git a/Source/charon/transforms/hashers/hasher_md5.h b/Source/charon/transforms/hashers/hasher_md5.h
index cc7c6c32a..d7e9124ee 100644
--- a/Source/charon/transforms/hashers/hasher_md5.h
+++ b/Source/charon/transforms/hashers/hasher_md5.h
@@ -27,13 +27,13 @@
 #include <transforms/hashers/hasher.h>
 
 
+typedef struct hasher_md5_t hasher_md5_t;
+
 /**
  * Object representing the md5 hasher
  * 
  */
-typedef struct hasher_md5_s hasher_md5_t;
-
-struct hasher_md5_s {
+struct hasher_md5_t {
 	
 	/**
 	 * generic hasher_t interface for this hasher
diff --git a/Source/charon/transforms/hashers/hasher_sha1.c b/Source/charon/transforms/hashers/hasher_sha1.c
index b8a7d14cc..75057457a 100644
--- a/Source/charon/transforms/hashers/hasher_sha1.c
+++ b/Source/charon/transforms/hashers/hasher_sha1.c
@@ -53,12 +53,12 @@
 #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
 
 
+typedef struct private_hasher_sha1_t private_hasher_sha1_t;
+
 /**
  * private data structure with hasing context
  */
-typedef struct private_hasher_sha1_s private_hasher_sha1_t;
-
-struct private_hasher_sha1_s {
+struct private_hasher_sha1_t {
 	/**
 	 * public interface for this hasher
 	 */
diff --git a/Source/charon/transforms/hashers/hasher_sha1.h b/Source/charon/transforms/hashers/hasher_sha1.h
index 76aa9049c..1f96d5d72 100644
--- a/Source/charon/transforms/hashers/hasher_sha1.h
+++ b/Source/charon/transforms/hashers/hasher_sha1.h
@@ -27,13 +27,13 @@
 #include <transforms/hashers/hasher.h>
 
 
+typedef struct hasher_sha1_t hasher_sha1_t;
+
 /**
  * Object representing the sha1 hasher
  * 
  */
-typedef struct hasher_sha1_s hasher_sha1_t;
-
-struct hasher_sha1_s {
+struct hasher_sha1_t {
 	
 	/**
 	 * generic hasher_t interface for this hasher