[svn-upgrade] Integrating new upstream version, strongswan (4.2.4)

8 files changed, 47 insertions, 1696 deletions

diff --git a/src/libstrongswan/crypto/hashers/hasher.c b/src/libstrongswan/crypto/hashers/hasher.c
index 9fa778aa6..6c29d1d5d 100644
--- a/src/libstrongswan/crypto/hashers/hasher.c
+++ b/src/libstrongswan/crypto/hashers/hasher.c
@@ -1,10 +1,3 @@
-/**
- * @file hasher.c
- * 
- * @brief Generic constructor for hasher_t.
- * 
- */
-
 /*
  * Copyright (C) 2005 Jan Hutter
  * Copyright (C) 2005-2006 Martin Willi
@@ -21,20 +14,16 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: hasher.c 3423 2008-01-22 10:32:37Z andreas $
+ * $Id: hasher.c 3619 2008-03-19 14:02:52Z martin $
  */
 
-
 #include "hasher.h"
 
 #include <asn1/oid.h>
-#include <crypto/hashers/sha1_hasher.h>
-#include <crypto/hashers/sha2_hasher.h>
-#include <crypto/hashers/md5_hasher.h>
-
 
 ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA512,
 	"HASH_UNKNOWN",
+	"HASH_PREFERRED",
 	"HASH_MD2",
 	"HASH_MD5",
 	"HASH_SHA1",
@@ -46,66 +35,31 @@ ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA512,
 /*
  * Described in header.
  */
-hasher_t *hasher_create(hash_algorithm_t hash_algorithm)
-{
-	switch (hash_algorithm)
-	{
-		case HASH_SHA1:
-		{
-			return (hasher_t*)sha1_hasher_create();
-		}
-		case HASH_SHA256:
-		case HASH_SHA384:
-		case HASH_SHA512:
-		{
-			return (hasher_t*)sha2_hasher_create(hash_algorithm);
-		}
-		case HASH_MD5:
-		{
-			return (hasher_t*)md5_hasher_create();
-		}
-		default:
-			return NULL;
-	}
-}
-
-/*
- * Described in header.
- */
 hash_algorithm_t hasher_algorithm_from_oid(int oid)
 {
-	hash_algorithm_t algorithm;
-
 	switch (oid)
 	{
 		case OID_MD2:
 		case OID_MD2_WITH_RSA:
-			algorithm = HASH_MD2;
-			break;
+			return HASH_MD2;
 		case OID_MD5:
 		case OID_MD5_WITH_RSA:
-			algorithm = HASH_MD5;
-			break;
+			return HASH_MD5;
 		case OID_SHA1:
 		case OID_SHA1_WITH_RSA:
-			algorithm = HASH_SHA1;
-			break;
+			return HASH_SHA1;
 		case OID_SHA256:
 		case OID_SHA256_WITH_RSA:
-			algorithm = HASH_SHA256;
-			break;
+			return HASH_SHA256;
 		case OID_SHA384:
 		case OID_SHA384_WITH_RSA:
-			algorithm = HASH_SHA384;
-			break;
+			return HASH_SHA384;
 		case OID_SHA512:
 		case OID_SHA512_WITH_RSA:
-			algorithm = HASH_SHA512;
-			break;
+			return HASH_SHA512;
 		default:
-			algorithm = HASH_UNKNOWN;
+			return HASH_UNKNOWN;
 	}
-	return algorithm;
 }
 
 /*
diff --git a/src/libstrongswan/crypto/hashers/hasher.h b/src/libstrongswan/crypto/hashers/hasher.h
index e73de7f01..e19b0318b 100644
--- a/src/libstrongswan/crypto/hashers/hasher.h
+++ b/src/libstrongswan/crypto/hashers/hasher.h
@@ -1,10 +1,3 @@
-/**
- * @file hasher.h
- * 
- * @brief Interface hasher_t.
- * 
- */
-
 /*
  * Copyright (C) 2005 Jan Hutter
  * Copyright (C) 2005-2006 Martin Willi
@@ -21,7 +14,12 @@
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  *
- * RCSID $Id: hasher.h 3423 2008-01-22 10:32:37Z andreas $
+ * $Id: hasher.h 3619 2008-03-19 14:02:52Z martin $
+ */
+ 
+/**
+ * @defgroup traffic_selector traffic_selector
+ * @{ @ingroup config
  */
 
 #ifndef HASHER_H_
@@ -33,30 +31,19 @@ typedef struct hasher_t hasher_t;
 #include <library.h>
 
 /**
- * @brief Algorithms to use for hashing.
- *
- * Currently only the following algorithms are implemented:
- * - HASH_MD5
- * - HASH_SHA1
- * - HASH_SHA256
- * - HASH_SHA384
- * - HASH_SHA512
- *
- * @ingroup hashers
+ * Algorithms to use for hashing.
  */
 enum hash_algorithm_t {
-	HASH_UNKNOWN = 0,
-	HASH_MD2 =     1,
-	/** Implemented in class md5_hasher_t */
-	HASH_MD5 =     2,
-	/** Implemented in class sha1_hasher_t */
-	HASH_SHA1 =    3,
-	/** Implemented in class sha2_hasher_t */
-	HASH_SHA256 =  4,
-	/** Implemented in class sha2_hasher_t */
-	HASH_SHA384 =  5,
-	/** Implemented in class sha2_hasher_t */
-	HASH_SHA512 =  6,
+	/** not specified hash function */
+	HASH_UNKNOWN 		= 0,
+	/** preferred hash function, general purpose */
+	HASH_PREFERRED	 	= 1,
+	HASH_MD2 			= 2,
+	HASH_MD5 			= 3,
+	HASH_SHA1 			= 4,
+	HASH_SHA256 		= 5,
+	HASH_SHA384 		= 6,
+	HASH_SHA512 		= 7,
 };
 
 #define HASH_SIZE_MD2		16
@@ -65,7 +52,6 @@ enum hash_algorithm_t {
 #define HASH_SIZE_SHA256	32
 #define HASH_SIZE_SHA384	48
 #define HASH_SIZE_SHA512	64
-#define HASH_SIZE_MAX		64
 
 /**
  * enum names for hash_algorithm_t.
@@ -73,16 +59,11 @@ enum hash_algorithm_t {
 extern enum_name_t *hash_algorithm_names;
 
 /**
- * @brief Generic interface for all hash functions.
- * 
- * @b Constructors:
- *  - hasher_create()
- * 
- * @ingroup hashers
+ * Generic interface for all hash functions.
  */
 struct hasher_t {
 	/**
-	 * @brief Hash data and write it in the buffer.
+	 * Hash data and write it in the buffer.
 	 * 
 	 * If the parameter hash is NULL, no result is written back
 	 * and more data can be appended to already hashed data.
@@ -91,108 +72,63 @@ struct hasher_t {
 	 * The hash output parameter must hold at least
 	 * hash_t.get_block_size() bytes.
 	 * 
-	 * @param this			calling object
-	 * @param data			data to hash
-	 * @param[out] hash		pointer where the hash will be written
+	 * @param data		data to hash
+	 * @param hash		pointer where the hash will be written
 	 */
 	void (*get_hash) (hasher_t *this, chunk_t data, u_int8_t *hash);
 	
 	/**
-	 * @brief Hash data and allocate space for the hash.
+	 * Hash data and allocate space for the hash.
 	 * 
 	 * If the parameter hash is NULL, no result is written back
 	 * and more data can be appended to already hashed data.
 	 * If not, the result is written back and the hasher is reset.
 	 * 
-	 * @param this			calling object
-	 * @param data			chunk with data to hash
-	 * @param[out] hash		chunk which will hold allocated hash
+	 * @param data		chunk with data to hash
+	 * @param hash		chunk which will hold allocated hash
 	 */
 	void (*allocate_hash) (hasher_t *this, chunk_t data, chunk_t *hash);
 	
 	/**
-	 * @brief Get the size of the resulting hash.
+	 * Get the size of the resulting hash.
 	 * 
-	 * @param this			calling object
-	 * @return				hash size in bytes
+	 * @return			hash size in bytes
 	 */
 	size_t (*get_hash_size) (hasher_t *this);
 	
 	/**
-	 * @brief Resets the hashers state.
-	 * 
-	 * @param this			calling object
+	 * Resets the hashers state.
 	 */
 	void (*reset) (hasher_t *this);
 	
 	/**
-	 * @brief Get the state of the hasher.
-	 *
-	 * A hasher stores internal state information. This state may be
-	 * manipulated to include a "seed" into the hashing operation. It used by
-	 * some exotic protocols (such as AKA).
-	 * The data pointed by chunk may be manipulated, but not replaced nor freed.
-	 * This is more a hack than a feature. The hasher's state may be byte
-	 * order dependant; use with care.
-	 *
-	 * @param this			calling object
-	 */
-	chunk_t (*get_state) (hasher_t *this);
-	
-	/**
-	 * @brief Destroys a hasher object.
-	 *
-	 * @param this 			calling object
+	 * Destroys a hasher object.
 	 */
 	void (*destroy) (hasher_t *this);
 };
 
 /**
- * @brief Generic interface to create a hasher_t.
+ * Conversion of ASN.1 OID to hash algorithm.
  * 
- * @param hash_algorithm	Algorithm to use for hashing
- * @return
- * 							- hasher_t object
- * 							- NULL if algorithm not supported
- * 
- * @ingroup hashers
- */
-hasher_t *hasher_create(hash_algorithm_t hash_algorithm);
-
-/**
- * @brief Conversion of ASN.1 OID to hash algorithm.
- * 
- * @param oid				ASN.1 OID
- * @return
- * 							- hash algorithm
- * 							- HASH_UNKNOWN if OID unsuported
- * 
- * @ingroup hashers
+ * @param oid			ASN.1 OID
+ * @return				hash algorithm, HASH_UNKNOWN if OID unsuported
  */
 hash_algorithm_t hasher_algorithm_from_oid(int oid);
 
 /**
- * @brief Conversion of hash algorithm into ASN.1 OID.
+ * Conversion of hash algorithm into ASN.1 OID.
  * 
- * @param alg				hash algorithm
- * @return
- * 							- ASN.1 hash OID if known hash algorithm
- * 							- OID_UNKNOW
- * 
- * @ingroup hashers
+ * @param alg			hash algorithm
+ * @return				ASN.1 OID, or OID_UNKNOW
  */
 int hasher_algorithm_to_oid(hash_algorithm_t alg);
 
 /**
- * @brief Conversion of hash signature algorithm into ASN.1 OID.
- * 
- * @param alg				hash algorithm
- * @return
- * 							- ASN.1 signature OID if known hash algorithm
- * 							- OID_UNKNOW
+ * Conversion of hash signature algorithm into ASN.1 OID.
  * 
- * @ingroup hashers
+ * @param alg			hash algorithm
+ * @return				ASN.1 OID if, or OID_UNKNOW
  */
 int hasher_signature_algorithm_to_oid(hash_algorithm_t alg);
 
-#endif /* HASHER_H_ */
+#endif /* HASHER_H_ @} */
diff --git a/src/libstrongswan/crypto/hashers/md5_hasher.c b/src/libstrongswan/crypto/hashers/md5_hasher.c
deleted file mode 100644
index d4dde3693..000000000
--- a/src/libstrongswan/crypto/hashers/md5_hasher.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/**
- * @file md5_hasher.c
- * 
- * @brief Implementation of md5_hasher_t.
- * 
- */
-
-/*
- * Copyright (C) 2005-2006 Martin Willi
- * Copyright (C) 2005 Jan Hutter
- * Hochschule fuer Technik Rapperswil
- * Copyright (C) 1991-1992, RSA Data Security, Inc. Created 1991. 
- * All rights reserved.
- * 
- * Derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm.
- * Ported to fulfill hasher_t interface.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include <string.h>
-
-#include "md5_hasher.h"
-
-
-/* Constants for MD5Transform routine. */
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-static u_int8_t PADDING[64] = {
-  0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/*
- * ugly macro stuff
- */ 
-/* F, G, H and I are basic MD5 functions.
- */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits.
- */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-Rotation is separate from addition to prevent recomputation.
- */
-#define FF(a, b, c, d, x, s, ac) { \
- (a) += F ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define GG(a, b, c, d, x, s, ac) { \
- (a) += G ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define HH(a, b, c, d, x, s, ac) { \
- (a) += H ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-#define II(a, b, c, d, x, s, ac) { \
- (a) += I ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
-  }
-
-
-
-typedef struct private_md5_hasher_t private_md5_hasher_t;
-
-/**
- * Private data structure with hasing context.
- */
-struct private_md5_hasher_t {
-	/**
-	 * Public interface for this hasher.
-	 */
-	md5_hasher_t public;
-	
-	/*
-	 * State of the hasher.
-	 */
-	u_int32_t state[5];
-    u_int32_t count[2];
-    u_int8_t buffer[64];
-};
-
-
-#if BYTE_ORDER != LITTLE_ENDIAN
-
-/* Encodes input (u_int32_t) into output (u_int8_t). Assumes len is
- * a multiple of 4.
- */
-static void Encode (u_int8_t *output, u_int32_t *input, size_t len)
-{
-	size_t i, j;
-
-	for (i = 0, j = 0; j < len; i++, j += 4) 
-	{
-		output[j] = (u_int8_t)(input[i] & 0xff);
-		output[j+1] = (u_int8_t)((input[i] >> 8) & 0xff);
-		output[j+2] = (u_int8_t)((input[i] >> 16) & 0xff);
-		output[j+3] = (u_int8_t)((input[i] >> 24) & 0xff);
-	}
-}
-
-/* Decodes input (u_int8_t) into output (u_int32_t). Assumes len is
- * a multiple of 4.
- */
-static void Decode(u_int32_t *output, u_int8_t *input, size_t len)
-{
-	size_t i, j;
-
-	for (i = 0, j = 0; j < len; i++, j += 4)
-	{
- 		output[i] = ((u_int32_t)input[j]) | (((u_int32_t)input[j+1]) << 8) |
-		(((u_int32_t)input[j+2]) << 16) | (((u_int32_t)input[j+3]) << 24);
-	}
-}
-
-#elif BYTE_ORDER == LITTLE_ENDIAN
- #define Encode memcpy
- #define Decode memcpy
-#endif
-
-/* MD5 basic transformation. Transforms state based on block.
- */
-static void MD5Transform(u_int32_t state[4], u_int8_t block[64])
-{
-	u_int32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
-	Decode(x, block, 64);
-
-	/* Round 1 */
-	FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-	FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-	FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-	FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-	FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-	FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-	FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-	FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-	FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-	FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-	FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-	FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-	FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-	FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-	FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-	FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
-	/* Round 2 */
-	GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-	GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-	GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-	GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-	GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-	GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-	GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-	GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-	GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-	GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-	GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-	GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-	GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-	GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-	GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-	GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-	/* Round 3 */
-	HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-	HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-	HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-	HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-	HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-	HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-	HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-	HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-	HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-	HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-	HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-	HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-	HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-	HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-	HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-	HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-	/* Round 4 */
-	II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-	II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-	II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-	II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-	II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-	II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-	II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-	II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-	II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-	II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-	II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-	II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-	II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-	II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-	II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-	II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-	state[0] += a;
-	state[1] += b;
-	state[2] += c;
-	state[3] += d;
-}
-
-/* MD5 block update operation. Continues an MD5 message-digest
- * operation, processing another message block, and updating the
- * context.
- */
-static void MD5Update(private_md5_hasher_t *this, u_int8_t *input, size_t inputLen)
-{
-	u_int32_t i;
-	size_t index, partLen;
-
-	/* Compute number of bytes mod 64 */
-	index = (u_int8_t)((this->count[0] >> 3) & 0x3F);
-
-	/* Update number of bits */
-	if ((this->count[0] += (inputLen << 3)) < (inputLen << 3))
-	{
-		this->count[1]++;
-	}
-	this->count[1] += (inputLen >> 29);
-
-	partLen = 64 - index;
-
-	/* Transform as many times as possible. */
-	if (inputLen >= partLen) 
-	{
-		memcpy(&this->buffer[index], input, partLen);
-		MD5Transform (this->state, this->buffer);
-
-		for (i = partLen; i + 63 < inputLen; i += 64)
-		{
-	    	MD5Transform (this->state, &input[i]);
-		}
-		index = 0;
-	}
-	else
-	{
-		i = 0;
-	}
-
-	/* Buffer remaining input */
-	memcpy(&this->buffer[index], &input[i], inputLen-i);
-}
-
-/* MD5 finalization. Ends an MD5 message-digest operation, writing the
- * the message digest and zeroizing the context.
- */
-static void MD5Final (private_md5_hasher_t *this, u_int8_t digest[16])
-{
-	u_int8_t bits[8];
-	size_t index, padLen;
-
-	/* Save number of bits */
-	Encode (bits, this->count, 8);
-
-	/* Pad out to 56 mod 64. */
-	index = (size_t)((this->count[0] >> 3) & 0x3f);
-	padLen = (index < 56) ? (56 - index) : (120 - index);
-	MD5Update (this, PADDING, padLen);
-
-	/* Append length (before padding) */
-	MD5Update (this, bits, 8);
-
-	if (digest != NULL)			/* Bill Simpson's padding */
-	{
-		/* store state in digest */
-		Encode (digest, this->state, 16);
-	}
-}
-
-
-
-/**
- * Implementation of hasher_t.get_hash.
- */
-static void get_hash(private_md5_hasher_t *this, chunk_t chunk, u_int8_t *buffer)
-{
-	MD5Update(this, chunk.ptr, chunk.len);
-	if (buffer != NULL)
-	{
-		MD5Final(this, buffer);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-	}
-}
-
-
-/**
- * Implementation of hasher_t.allocate_hash.
- */
-static void allocate_hash(private_md5_hasher_t *this, chunk_t chunk, chunk_t *hash)
-{
-	chunk_t allocated_hash;
-	
-	MD5Update(this, chunk.ptr, chunk.len);
-	if (hash != NULL)
-	{
-		allocated_hash.ptr = malloc(HASH_SIZE_MD5);
-		allocated_hash.len = HASH_SIZE_MD5;
-
-		MD5Final(this, allocated_hash.ptr);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-		
-		*hash = allocated_hash;
-	}
-}
-	
-/**
- * Implementation of hasher_t.get_hash_size.
- */
-static size_t get_hash_size(private_md5_hasher_t *this)
-{
-	return HASH_SIZE_MD5;
-}
-
-/**
- * Implementation of hasher_t.reset.
- */
-static void reset(private_md5_hasher_t *this)
-{
-	this->state[0] = 0x67452301;
-	this->state[1] = 0xefcdab89;
-	this->state[2] = 0x98badcfe;
-	this->state[3] = 0x10325476;
-	this->count[0] = 0;
-	this->count[1] = 0;
-}
-
-/**
- * Implementation of hasher_t.get_state
- */
-static chunk_t get_state(private_md5_hasher_t *this)
-{
-	chunk_t chunk;
-	
-	chunk.ptr = (u_char*)&this->state[0];
-	chunk.len = sizeof(this->state);
-	
-	return chunk;
-}
-
-/**
- * Implementation of hasher_t.destroy.
- */
-static void destroy(private_md5_hasher_t *this)
-{
-	free(this);
-}
-
-/*
- * Described in header.
- */
-md5_hasher_t *md5_hasher_create(void)
-{
-	private_md5_hasher_t *this = malloc_thing(private_md5_hasher_t);
-
-	this->public.hasher_interface.get_hash = (void (*) (hasher_t*, chunk_t, u_int8_t*))get_hash;
-	this->public.hasher_interface.allocate_hash = (void (*) (hasher_t*, chunk_t, chunk_t*))allocate_hash;
-	this->public.hasher_interface.get_hash_size = (size_t (*) (hasher_t*))get_hash_size;
-	this->public.hasher_interface.reset = (void (*) (hasher_t*))reset;
-	this->public.hasher_interface.get_state = (chunk_t (*) (hasher_t*))get_state;
-	this->public.hasher_interface.destroy = (void (*) (hasher_t*))destroy;
-	
-	/* initialize */
-	reset(this);
-	
-	return &(this->public);
-}
diff --git a/src/libstrongswan/crypto/hashers/md5_hasher.h b/src/libstrongswan/crypto/hashers/md5_hasher.h
deleted file mode 100644
index 715f11663..000000000
--- a/src/libstrongswan/crypto/hashers/md5_hasher.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * @file md5_hasher.h
- * 
- * @brief Interface for md5_hasher_t.
- * 
- */
-
-/*
- * Copyright (C) 2005-2006 Martin Willi
- * Copyright (C) 2005 Jan Hutter
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#ifndef MD5_HASHER_H_
-#define MD5_HASHER_H_
-
-typedef struct md5_hasher_t md5_hasher_t;
-
-#include <crypto/hashers/hasher.h>
-
-/**
- * @brief Implementation of hasher_t interface using the
- * MD5 algorithm.
- *
- * @b Constructors:
- * - hasher_create() using HASH_MD5 as algorithm
- * - md5_hasher_create()
- *
- * @see hasher_t
- *
- * @ingroup hashers
- */
-struct md5_hasher_t {
-	
-	/**
-	 * Generic hasher_t interface for this hasher.
-	 */
-	hasher_t hasher_interface;
-};
-
-/**
- * @brief Creates a new md5_hasher_t.
- * 
- * @return	md5_hasher_t object
- * 
- * @ingroup hashers
- */
-md5_hasher_t *md5_hasher_create(void);
-
-#endif /*MD5_HASHER_H_*/
diff --git a/src/libstrongswan/crypto/hashers/sha1_hasher.c b/src/libstrongswan/crypto/hashers/sha1_hasher.c
deleted file mode 100644
index 6a86937ae..000000000
--- a/src/libstrongswan/crypto/hashers/sha1_hasher.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/**
- * @file sha1_hasher.c
- * 
- * @brief Implementation of hasher_sha_t.
- * 
- */
-
-/*
- * Copyright (C) 2005-2006 Martin Willi
- * Copyright (C) 2005 Jan Hutter
- * Hochschule fuer Technik Rapperswil
- * 
- * Ported from Steve Reid's <steve@edmweb.com> implementation
- * "SHA1 in C" found in strongSwan.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include <string.h>
-
-#include "sha1_hasher.h"
-
-/*
- * ugly macro stuff
- */ 
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-#if BYTE_ORDER == LITTLE_ENDIAN
- #define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) |(rol(block->l[i],8)&0x00FF00FF))
-#elif BYTE_ORDER == BIG_ENDIAN
- #define blk0(i) block->l[i]
-#else
- #error "Endianness not defined!"
-#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] ^block->l[(i+2)&15]^block->l[i&15],1))
-
-/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#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_sha1_hasher_t private_sha1_hasher_t;
-
-/**
- * Private data structure with hasing context.
- */
-struct private_sha1_hasher_t {
-	/**
-	 * Public interface for this hasher.
-	 */
-	sha1_hasher_t public;
-	
-	/*
-	 * State of the hasher.
-	 */
-	u_int32_t state[5];
-    u_int32_t count[2];
-    u_int8_t buffer[64];
-};
-
-/* 
- * Hash a single 512-bit block. This is the core of the algorithm. *
- */
-static void SHA1Transform(u_int32_t state[5], const unsigned char buffer[64])
-{
-	u_int32_t a, b, c, d, e;
-	typedef union {
-    	u_int8_t c[64];
-    	u_int32_t l[16];
-	} CHAR64LONG16;
-	CHAR64LONG16 block[1];  /* use array to appear as a pointer */
-    memcpy(block, buffer, 64);
-
-    /* Copy context->state[] to working vars */
-    a = state[0];
-    b = state[1];
-    c = state[2];
-    d = state[3];
-    e = state[4];
-    /* 4 rounds of 20 operations each. Loop unrolled. */
-    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
-    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
-    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
-    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
-    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
-    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
-    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
-    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
-    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
-    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
-    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
-    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
-    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
-    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
-    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
-    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
-    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
-    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
-    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-    /* Add the working vars back into context.state[] */
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-    state[4] += e;
-    /* Wipe variables */
-    a = b = c = d = e = 0;
-    memset(block, '\0', sizeof(block));
-}
-
-/* 
- * Run your data through this. 
- */
-static void SHA1Update(private_sha1_hasher_t* this, u_int8_t *data, u_int32_t len)
-{
-	u_int32_t i;
-	u_int32_t j;
-
-    j = this->count[0];
-    if ((this->count[0] += len << 3) < j)
-    {
-		this->count[1]++;
-    }
-    this->count[1] += (len>>29);
-    j = (j >> 3) & 63;
-    if ((j + len) > 63) 
-    {
-        memcpy(&this->buffer[j], data, (i = 64-j));
-        SHA1Transform(this->state, this->buffer);
-        for ( ; i + 63 < len; i += 64) 
-        {
-            SHA1Transform(this->state, &data[i]);
-        }
-        j = 0;
-    }
-    else 
-    {
-    	i = 0;
-    }
-    memcpy(&this->buffer[j], &data[i], len - i);
-}
-
-
-/* 
- * Add padding and return the message digest. 
- */
-static void SHA1Final(private_sha1_hasher_t *this, u_int8_t *digest)
-{
-	u_int32_t i;
-	u_int8_t finalcount[8];
-	u_int8_t c;
-
-    for (i = 0; i < 8; i++) 
-    {
-        finalcount[i] = (u_int8_t)((this->count[(i >= 4 ? 0 : 1)]
-         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
-    }
-    c = 0200;
-    SHA1Update(this, &c, 1);
-    while ((this->count[0] & 504) != 448) 
-    {
-		c = 0000;
-        SHA1Update(this, &c, 1);
-    }
-    SHA1Update(this, finalcount, 8);  /* Should cause a SHA1Transform() */
-    for (i = 0; i < 20; i++) 
-    {
-        digest[i] = (u_int8_t)((this->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
-    }
-}
-
-
-/**
- * Implementation of hasher_t.get_hash.
- */
-static void get_hash(private_sha1_hasher_t *this, chunk_t chunk, u_int8_t *buffer)
-{
-	SHA1Update(this, chunk.ptr, chunk.len);
-	if (buffer != NULL)
-	{
-		SHA1Final(this, buffer);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-	}
-}
-
-
-/**
- * Implementation of hasher_t.allocate_hash.
- */
-static void allocate_hash(private_sha1_hasher_t *this, chunk_t chunk, chunk_t *hash)
-{
-	chunk_t allocated_hash;
-	
-	SHA1Update(this, chunk.ptr, chunk.len);
-	if (hash != NULL)
-	{	
-		allocated_hash.ptr = malloc(HASH_SIZE_SHA1);
-		allocated_hash.len = HASH_SIZE_SHA1;
-		
-		SHA1Final(this, allocated_hash.ptr);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-		
-		*hash = allocated_hash;
-	}
-}
-	
-/**
- * Implementation of hasher_t.get_hash_size.
- */
-static size_t get_hash_size(private_sha1_hasher_t *this)
-{
-	return HASH_SIZE_SHA1;
-}
-
-/**
- * Implementation of hasher_t.reset.
- */
-static void reset(private_sha1_hasher_t *this)
-{
-	this->state[0] = 0x67452301;
-    this->state[1] = 0xEFCDAB89;
-    this->state[2] = 0x98BADCFE;
-    this->state[3] = 0x10325476;
-    this->state[4] = 0xC3D2E1F0;
-    this->count[0] = 0;
-    this->count[1] = 0;
-}
-
-/**
- * Implementation of hasher_t.get_state
- */
-static chunk_t get_state(private_sha1_hasher_t *this)
-{
-	chunk_t chunk;
-	
-	chunk.ptr = (u_char*)&this->state[0];
-	chunk.len = sizeof(this->state);
-	
-	return chunk;
-}
-
-/**
- * Implementation of hasher_t.destroy.
- */
-static void destroy(private_sha1_hasher_t *this)
-{
-	free(this);
-}
-
-/*
- * Described in header.
- */
-sha1_hasher_t *sha1_hasher_create(void)
-{
-	private_sha1_hasher_t *this = malloc_thing(private_sha1_hasher_t);
-	
-	this->public.hasher_interface.get_hash = (void (*) (hasher_t*, chunk_t, u_int8_t*))get_hash;
-	this->public.hasher_interface.allocate_hash = (void (*) (hasher_t*, chunk_t, chunk_t*))allocate_hash;
-	this->public.hasher_interface.get_hash_size = (size_t (*) (hasher_t*))get_hash_size;
-	this->public.hasher_interface.reset = (void (*) (hasher_t*))reset;
-	this->public.hasher_interface.get_state = (chunk_t (*) (hasher_t*))get_state;
-	this->public.hasher_interface.destroy = (void (*) (hasher_t*))destroy;
-	
-	/* initialize */
-	reset(this);
-	
-	return &(this->public);
-}
diff --git a/src/libstrongswan/crypto/hashers/sha1_hasher.h b/src/libstrongswan/crypto/hashers/sha1_hasher.h
deleted file mode 100644
index 380fa9845..000000000
--- a/src/libstrongswan/crypto/hashers/sha1_hasher.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * @file sha1_hasher.h
- * 
- * @brief Interface of sha1_hasher_t
- * 
- */
-
-/*
- * Copyright (C) 2005-2006 Martin Willi
- * Copyright (C) 2005 Jan Hutter
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#ifndef SHA1_HASHER_H_
-#define SHA1_HASHER_H_
-
-typedef struct sha1_hasher_t sha1_hasher_t;
-
-#include <crypto/hashers/hasher.h>
-
-/**
- * @brief Implementation of hasher_t interface using the
- * SHA1 algorithm.
- * 
- * @b Constructors:
- * - hasher_create() using HASH_SHA1 as algorithm
- * - sha1_hasher_create()
- * 
- * @see hasher_t
- * 
- * @ingroup hashers
- */
-struct sha1_hasher_t {
-	
-	/**
-	 * Generic hasher_t interface for this hasher.
-	 */
-	hasher_t hasher_interface;
-};
-
-/**
- * @brief Creates a new sha1_hasher_t.
- * 
- * @return	sha1_hasher_t object
- * 
- * @ingroup hashers
- */
-sha1_hasher_t *sha1_hasher_create(void);
-
-#endif /*SHA1_HASHER_H_*/
diff --git a/src/libstrongswan/crypto/hashers/sha2_hasher.c b/src/libstrongswan/crypto/hashers/sha2_hasher.c
deleted file mode 100644
index b68972cec..000000000
--- a/src/libstrongswan/crypto/hashers/sha2_hasher.c
+++ /dev/null
@@ -1,672 +0,0 @@
-/**
- * @file sha2_hasher.c
- * 
- * @brief Implementation of hasher_sha_t.
- * 
- */
-
-/*
- * Copyright (C) 2006 Martin Willi
- * Hochschule fuer Technik Rapperswil
- * Copyright (C) 2001 Jari Ruusu.
- *
- * Ported from strongSwans implementation written by Jari Ruusu.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include <string.h>
-
-#include "sha2_hasher.h"
-
-
-typedef struct private_sha512_hasher_t private_sha512_hasher_t;
-
-/**
- * Private data structure with hasing context for SHA384 and SHA512
- */
-struct private_sha512_hasher_t {
-	/**
-	 * Public interface for this hasher.
-	 */
-	sha2_hasher_t public;
-	
-	unsigned char   sha_out[128];   /* results are here, bytes 0..47/0..63 */
-	u_int64_t       sha_H[8];
-	u_int64_t       sha_blocks;
-	u_int64_t       sha_blocksMSB;
-	int             sha_bufCnt;
-};
-
-
-typedef struct private_sha256_hasher_t private_sha256_hasher_t;
-
-/**
- * Private data structure with hasing context for SHA256
- */
-struct private_sha256_hasher_t {
-	/**
-	 * Public interface for this hasher.
-	 */
-	sha2_hasher_t public;
-	
-	unsigned char   sha_out[64];    /* results are here, bytes 0...31 */
-	u_int32_t       sha_H[8];
-	u_int64_t       sha_blocks;
-	int             sha_bufCnt;
-};
-
-
-static const u_int32_t sha256_hashInit[8] = {
-	0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c,
-	0x1f83d9ab, 0x5be0cd19
-};
-
-static const u_int32_t sha256_K[64] = {
-	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1,
-	0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
-	0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786,
-	0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-	0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
-	0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
-	0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b,
-	0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-	0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a,
-	0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
-	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-};
-
-static const u_int64_t sha512_hashInit[8] = {
-	0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, 0x3c6ef372fe94f82bULL,
-	0xa54ff53a5f1d36f1ULL, 0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
-	0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
-};
-
-static const u_int64_t sha384_hashInit[8] = {
-	0xcbbb9d5dc1059ed8ULL, 0x629a292a367cd507ULL, 0x9159015a3070dd17ULL,
-	0x152fecd8f70e5939ULL, 0x67332667ffc00b31ULL, 0x8eb44a8768581511ULL,
-	0xdb0c2e0d64f98fa7ULL, 0x47b5481dbefa4fa4ULL
-};
-
-static const u_int64_t sha512_K[80] = {
-	0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL,
-	0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
-	0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL,
-	0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
-	0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL,
-	0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
-	0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL,
-	0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
-	0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL,
-	0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
-	0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL,
-	0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
-	0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL,
-	0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
-	0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL,
-	0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
-	0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL,
-	0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
-	0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL,
-	0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
-	0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL,
-	0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
-	0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL,
-	0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
-	0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL,
-	0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
-	0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
-};
-
-
-/* set macros for SHA256 */
-#define Ch(x,y,z)   (((x) & (y)) ^ ((~(x)) & (z)))
-#define Maj(x,y,z)  (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-#define R(x,y)      ((y) >> (x))
-
-#define S(x,y)      (((y) >> (x)) | ((y) << (32 - (x))))
-#define uSig0(x)    ((S(2,(x))) ^ (S(13,(x))) ^ (S(22,(x))))
-#define uSig1(x)    ((S(6,(x))) ^ (S(11,(x))) ^ (S(25,(x))))
-#define lSig0(x)    ((S(7,(x))) ^ (S(18,(x))) ^ (R(3,(x))))
-#define lSig1(x)    ((S(17,(x))) ^ (S(19,(x))) ^ (R(10,(x))))
-
-/**
- * Single block SHA256 transformation
- */
-static void sha256_transform(private_sha256_hasher_t *ctx, 
-							 const unsigned char *datap)
-{
-	register int    j;
-	u_int32_t       a, b, c, d, e, f, g, h;
-	u_int32_t       T1, T2, W[64], Wm2, Wm15;
-
-	/* read the data, big endian byte order */
-	j = 0;
-	do {
-		W[j] = (((u_int32_t)(datap[0]))<<24) | (((u_int32_t)(datap[1]))<<16) |
-				(((u_int32_t)(datap[2]))<<8 ) | ((u_int32_t)(datap[3]));
-		datap += 4;
-	} while(++j < 16);
-
-	/* initialize variables a...h */
-	a = ctx->sha_H[0];
-	b = ctx->sha_H[1];
-	c = ctx->sha_H[2];
-	d = ctx->sha_H[3];
-	e = ctx->sha_H[4];
-	f = ctx->sha_H[5];
-	g = ctx->sha_H[6];
-	h = ctx->sha_H[7];
-
-	/* apply compression function */
-	j = 0;
-	do
-	{
-		if(j >= 16) 
-		{
-			Wm2 = W[j - 2];
-			Wm15 = W[j - 15];
-			W[j] = lSig1(Wm2) + W[j - 7] + lSig0(Wm15) + W[j - 16];
-		}
-		T1 = h + uSig1(e) + Ch(e,f,g) + sha256_K[j] + W[j];
-		T2 = uSig0(a) + Maj(a,b,c);
-		h = g; g = f; f = e;
-		e = d + T1;
-		d = c; c = b; b = a;
-		a = T1 + T2;
-	} while(++j < 64);
-
-	/* compute intermediate hash value */
-	ctx->sha_H[0] += a;
-	ctx->sha_H[1] += b;
-	ctx->sha_H[2] += c;
-	ctx->sha_H[3] += d;
-	ctx->sha_H[4] += e;
-	ctx->sha_H[5] += f;
-	ctx->sha_H[6] += g;
-	ctx->sha_H[7] += h;
-
-	ctx->sha_blocks++;
-}
-
-/**
- * Update SHA256 hash
- */
-static void sha256_write(private_sha256_hasher_t *ctx, 
-						 const unsigned char *datap, int length)
-{
-	while(length > 0)
-	{
-		if(!ctx->sha_bufCnt)
-		{
-			while(length >= sizeof(ctx->sha_out))
-			{
-				sha256_transform(ctx, datap);
-				datap += sizeof(ctx->sha_out);
-				length -= sizeof(ctx->sha_out);
-			}
-			if(!length) return;
-		}
-		ctx->sha_out[ctx->sha_bufCnt] = *datap++;
-		length--;
-		if(++ctx->sha_bufCnt == sizeof(ctx->sha_out))
-		{
-			sha256_transform(ctx, &ctx->sha_out[0]);
-			ctx->sha_bufCnt = 0;
-		}
-	}
-}
-
-/**
- * finalize SHA256 hash
- */
-static void sha256_final(private_sha256_hasher_t *ctx)
-{
-	register int    j;
-	u_int64_t       bitLength;
-	u_int32_t       i;
-	unsigned char   padByte, *datap;
-
-	bitLength = (ctx->sha_blocks << 9) | (ctx->sha_bufCnt << 3);
-	padByte = 0x80;
-	sha256_write(ctx, &padByte, 1);
-
-	/* pad extra space with zeroes */
-	padByte = 0;
-	while(ctx->sha_bufCnt != 56)
-	{
-		sha256_write(ctx, &padByte, 1);
-	}
-	
-	/* write bit length, big endian byte order */
-	ctx->sha_out[56] = bitLength >> 56;
-	ctx->sha_out[57] = bitLength >> 48;
-	ctx->sha_out[58] = bitLength >> 40;
-	ctx->sha_out[59] = bitLength >> 32;
-	ctx->sha_out[60] = bitLength >> 24;
-	ctx->sha_out[61] = bitLength >> 16;
-	ctx->sha_out[62] = bitLength >> 8;
-	ctx->sha_out[63] = bitLength;
-	sha256_transform(ctx, &ctx->sha_out[0]);
-	
-	/* return results in ctx->sha_out[0...31] */
-	datap = &ctx->sha_out[0];
-	j = 0;
-	do {
-		i = ctx->sha_H[j];
-		datap[0] = i >> 24;
-		datap[1] = i >> 16;
-		datap[2] = i >> 8;
-		datap[3] = i;
-		datap += 4;
-	} while(++j < 8);
-}
-
-/* update macros for SHA512 */
-#undef S
-#undef uSig0
-#undef uSig1
-#undef lSig0
-#undef lSig1
-#define S(x,y)      (((y) >> (x)) | ((y) << (64 - (x))))
-#define uSig0(x)    ((S(28,(x))) ^ (S(34,(x))) ^ (S(39,(x))))
-#define uSig1(x)    ((S(14,(x))) ^ (S(18,(x))) ^ (S(41,(x))))
-#define lSig0(x)    ((S(1,(x))) ^ (S(8,(x))) ^ (R(7,(x))))
-#define lSig1(x)    ((S(19,(x))) ^ (S(61,(x))) ^ (R(6,(x))))
-
-/**
- * Single block SHA384/SHA512 transformation
- */
-static void sha512_transform(private_sha512_hasher_t *ctx, 
-							 const unsigned char *datap)
-{
-	register int    j;
-	u_int64_t       a, b, c, d, e, f, g, h;
-	u_int64_t       T1, T2, W[80], Wm2, Wm15;
-
-	/* read the data, big endian byte order */
-	j = 0;
-	do {
-		W[j] = (((u_int64_t)(datap[0]))<<56) | (((u_int64_t)(datap[1]))<<48) |
-				(((u_int64_t)(datap[2]))<<40) | (((u_int64_t)(datap[3]))<<32) |
-				(((u_int64_t)(datap[4]))<<24) | (((u_int64_t)(datap[5]))<<16) |
-				(((u_int64_t)(datap[6]))<<8 ) | ((u_int64_t)(datap[7]));
-		datap += 8;
-	} while(++j < 16);
-
-	/* initialize variables a...h */
-	a = ctx->sha_H[0];
-	b = ctx->sha_H[1];
-	c = ctx->sha_H[2];
-	d = ctx->sha_H[3];
-	e = ctx->sha_H[4];
-	f = ctx->sha_H[5];
-	g = ctx->sha_H[6];
-	h = ctx->sha_H[7];
-
-	/* apply compression function */
-	j = 0;
-	do {
-		if(j >= 16) {
-			Wm2 = W[j - 2];
-			Wm15 = W[j - 15];
-			W[j] = lSig1(Wm2) + W[j - 7] + lSig0(Wm15) + W[j - 16];
-		}
-		T1 = h + uSig1(e) + Ch(e,f,g) + sha512_K[j] + W[j];
-		T2 = uSig0(a) + Maj(a,b,c);
-		h = g; g = f; f = e;
-		e = d + T1;
-		d = c; c = b; b = a;
-		a = T1 + T2;
-	} while(++j < 80);
-
-	/* compute intermediate hash value */
-	ctx->sha_H[0] += a;
-	ctx->sha_H[1] += b;
-	ctx->sha_H[2] += c;
-	ctx->sha_H[3] += d;
-	ctx->sha_H[4] += e;
-	ctx->sha_H[5] += f;
-	ctx->sha_H[6] += g;
-	ctx->sha_H[7] += h;
-
-	ctx->sha_blocks++;
-	if(!ctx->sha_blocks) ctx->sha_blocksMSB++;
-}
-
-/**
- * Update a SHA384/SHA512 hash
- */
-static void sha512_write(private_sha512_hasher_t *ctx, 
-						 const unsigned char *datap, int length)
-{
-	while(length > 0) 
-	{
-		if(!ctx->sha_bufCnt) 
-		{
-			while(length >= sizeof(ctx->sha_out)) 
-			{
-				sha512_transform(ctx, datap);
-				datap += sizeof(ctx->sha_out);
-				length -= sizeof(ctx->sha_out);
-			}
-			if(!length) return;
-		}
-		ctx->sha_out[ctx->sha_bufCnt] = *datap++;
-		length--;
-		if(++ctx->sha_bufCnt == sizeof(ctx->sha_out)) 
-		{
-			sha512_transform(ctx, &ctx->sha_out[0]);
-			ctx->sha_bufCnt = 0;
-		}
-	}
-}
-
-/**
- * Finalize a SHA384/SHA512 hash
- */
-static void sha512_final(private_sha512_hasher_t *ctx)
-{
-	register int    j;
-	u_int64_t       bitLength, bitLengthMSB;
-	u_int64_t       i;
-	unsigned char   padByte, *datap;
-
-	bitLength = (ctx->sha_blocks << 10) | (ctx->sha_bufCnt << 3);
-	bitLengthMSB = (ctx->sha_blocksMSB << 10) | (ctx->sha_blocks >> 54);
-	padByte = 0x80;
-	sha512_write(ctx, &padByte, 1);
-
-	/* pad extra space with zeroes */
-	padByte = 0;
-	while(ctx->sha_bufCnt != 112) 
-	{
-		sha512_write(ctx, &padByte, 1);
-	}
-
-	/* write bit length, big endian byte order */
-	ctx->sha_out[112] = bitLengthMSB >> 56;
-	ctx->sha_out[113] = bitLengthMSB >> 48;
-	ctx->sha_out[114] = bitLengthMSB >> 40;
-	ctx->sha_out[115] = bitLengthMSB >> 32;
-	ctx->sha_out[116] = bitLengthMSB >> 24;
-	ctx->sha_out[117] = bitLengthMSB >> 16;
-	ctx->sha_out[118] = bitLengthMSB >> 8;
-	ctx->sha_out[119] = bitLengthMSB;
-	ctx->sha_out[120] = bitLength >> 56;
-	ctx->sha_out[121] = bitLength >> 48;
-	ctx->sha_out[122] = bitLength >> 40;
-	ctx->sha_out[123] = bitLength >> 32;
-	ctx->sha_out[124] = bitLength >> 24;
-	ctx->sha_out[125] = bitLength >> 16;
-	ctx->sha_out[126] = bitLength >> 8;
-	ctx->sha_out[127] = bitLength;
-	sha512_transform(ctx, &ctx->sha_out[0]);
-	
-	/* return results in ctx->sha_out[0...63] */
-	datap = &ctx->sha_out[0];
-	j = 0;
-	do {
-		i = ctx->sha_H[j];
-		datap[0] = i >> 56;
-		datap[1] = i >> 48;
-		datap[2] = i >> 40;
-		datap[3] = i >> 32;
-		datap[4] = i >> 24;
-		datap[5] = i >> 16;
-		datap[6] = i >> 8;
-		datap[7] = i;
-		datap += 8;
-	} while(++j < 8);
-}
-
-/**
- * Implementation of hasher_t.get_hash for SHA256.
- */
-static void get_hash256(private_sha256_hasher_t *this, 
-						chunk_t chunk, u_int8_t *buffer)
-{
-	sha256_write(this, chunk.ptr, chunk.len);
-	if (buffer != NULL)
-	{
-		sha256_final(this);
-		memcpy(buffer, this->sha_out, HASH_SIZE_SHA256);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-	}
-}
-
-/**
- * Implementation of hasher_t.get_hash for SHA384.
- */
-static void get_hash384(private_sha512_hasher_t *this,
-						chunk_t chunk, u_int8_t *buffer)
-{
-	sha512_write(this, chunk.ptr, chunk.len);
-	if (buffer != NULL)
-	{
-		sha512_final(this);
-		memcpy(buffer, this->sha_out, HASH_SIZE_SHA384);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-	}
-}
-
-/**
- * Implementation of hasher_t.get_hash for SHA512.
- */
-static void get_hash512(private_sha512_hasher_t *this,
-						chunk_t chunk, u_int8_t *buffer)
-{
-	sha512_write(this, chunk.ptr, chunk.len);
-	if (buffer != NULL)
-	{
-		sha512_final(this);
-		memcpy(buffer, this->sha_out, HASH_SIZE_SHA512);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-	}
-}
-
-/**
- * Implementation of hasher_t.allocate_hash for SHA256.
- */
-static void allocate_hash256(private_sha256_hasher_t *this, 
-							 chunk_t chunk, chunk_t *hash)
-{
-	chunk_t allocated_hash;
-	
-	sha256_write(this, chunk.ptr, chunk.len);
-	if (hash != NULL)
-	{
-		sha256_final(this);
-		allocated_hash = chunk_alloc(HASH_SIZE_SHA256);
-		memcpy(allocated_hash.ptr, this->sha_out, HASH_SIZE_SHA256);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-		*hash = allocated_hash;
-	}
-}
-
-/**
- * Implementation of hasher_t.allocate_hash for SHA384.
- */
-static void allocate_hash384(private_sha512_hasher_t *this, 
-							 chunk_t chunk, chunk_t *hash)
-{
-	chunk_t allocated_hash;
-	
-	sha512_write(this, chunk.ptr, chunk.len);
-	if (hash != NULL)
-	{
-		sha512_final(this);
-		allocated_hash = chunk_alloc(HASH_SIZE_SHA384);
-		memcpy(allocated_hash.ptr, this->sha_out, HASH_SIZE_SHA384);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-		*hash = allocated_hash;
-	}
-}
-
-/**
- * Implementation of hasher_t.allocate_hash for SHA512.
- */
-static void allocate_hash512(private_sha512_hasher_t *this, 
-							 chunk_t chunk, chunk_t *hash)
-{
-	chunk_t allocated_hash;
-	
-	sha512_write(this, chunk.ptr, chunk.len);
-	if (hash != NULL)
-	{
-		sha512_final(this);
-		allocated_hash = chunk_alloc(HASH_SIZE_SHA512);
-		memcpy(allocated_hash.ptr, this->sha_out, HASH_SIZE_SHA512);
-		this->public.hasher_interface.reset(&(this->public.hasher_interface));
-		*hash = allocated_hash;
-	}
-}
-
-/**
- * Implementation of hasher_t.get_hash_size for SHA256.
- */
-static size_t get_hash_size256(private_sha256_hasher_t *this)
-{
-	return HASH_SIZE_SHA256;
-}
-	
-/**
- * Implementation of hasher_t.get_hash_size for SHA384.
- */
-static size_t get_hash_size384(private_sha512_hasher_t *this)
-{
-	return HASH_SIZE_SHA384;
-}
-	
-/**
- * Implementation of hasher_t.get_hash_size for SHA512.
- */
-static size_t get_hash_size512(private_sha512_hasher_t *this)
-{
-	return HASH_SIZE_SHA512;
-}
-
-/**
- * Implementation of hasher_t.reset for SHA256
- */
-static void reset256(private_sha256_hasher_t *ctx)
-{
-	memcpy(&ctx->sha_H[0], &sha256_hashInit[0], sizeof(ctx->sha_H));
-	ctx->sha_blocks = 0;
-	ctx->sha_bufCnt = 0;
-}
-
-/**
- * Implementation of hasher_t.reset for SHA384
- */
-static void reset384(private_sha512_hasher_t *ctx)
-{
-	memcpy(&ctx->sha_H[0], &sha384_hashInit[0], sizeof(ctx->sha_H));
-	ctx->sha_blocks = 0;
-	ctx->sha_blocksMSB = 0;
-	ctx->sha_bufCnt = 0;
-}
-
-/**
- * Implementation of hasher_t.reset for SHA512
- */
-static void reset512(private_sha512_hasher_t *ctx)
-{
-	memcpy(&ctx->sha_H[0], &sha512_hashInit[0], sizeof(ctx->sha_H));
-	ctx->sha_blocks = 0;
-	ctx->sha_blocksMSB = 0;
-	ctx->sha_bufCnt = 0;
-}
-
-/**
- * Implementation of hasher_t.get_state for SHA256
- */
-static chunk_t get_state256(private_sha256_hasher_t *ctx)
-{
-	chunk_t chunk;
-	chunk.ptr = (u_char*)&ctx->sha_H[0];
-	chunk.len = HASH_SIZE_SHA256;
-	return chunk;
-}
-
-/**
- * Implementation of hasher_t.get_state for SHA384
- */
-static chunk_t get_state384(private_sha512_hasher_t *ctx)
-{
-	chunk_t chunk;
-	chunk.ptr = (u_char*)&ctx->sha_H[0];
-	chunk.len = HASH_SIZE_SHA384;
-	return chunk;
-}
-/**
- * Implementation of hasher_t.get_state for SHA512
- */
-static chunk_t get_state512(private_sha512_hasher_t *ctx)
-{
-	chunk_t chunk;
-	chunk.ptr = (u_char*)&ctx->sha_H[0];
-	chunk.len = HASH_SIZE_SHA512;
-	return chunk;
-}
-
-/**
- * Implementation of hasher_t.destroy.
- */
-static void destroy(sha2_hasher_t *this)
-{
-	free(this);
-}
-
-/*
- * Described in header.
- */
-sha2_hasher_t *sha2_hasher_create(hash_algorithm_t algorithm)
-{
-	sha2_hasher_t *this;
-	
-	switch (algorithm)
-	{
-		case HASH_SHA256:
-			this = (sha2_hasher_t*)malloc_thing(private_sha256_hasher_t);
-			this->hasher_interface.reset = (void(*)(hasher_t*))reset256;
-			this->hasher_interface.get_state = (chunk_t(*)(hasher_t*))get_state256;
-			this->hasher_interface.get_hash_size = (size_t(*)(hasher_t*))get_hash_size256;
-			this->hasher_interface.get_hash = (void(*)(hasher_t*,chunk_t,u_int8_t*))get_hash256;
-			this->hasher_interface.allocate_hash = (void(*)(hasher_t*,chunk_t,chunk_t*))allocate_hash256;
-			break;
-		case HASH_SHA384:
-			/* uses SHA512 data structure */
-			this = (sha2_hasher_t*)malloc_thing(private_sha512_hasher_t);
-			this->hasher_interface.reset = (void(*)(hasher_t*))reset384;
-			this->hasher_interface.get_state = (chunk_t(*)(hasher_t*))get_state384;
-			this->hasher_interface.get_hash_size = (size_t(*)(hasher_t*))get_hash_size384;
-			this->hasher_interface.get_hash = (void(*)(hasher_t*,chunk_t,u_int8_t*))get_hash384;
-			this->hasher_interface.allocate_hash = (void(*)(hasher_t*,chunk_t,chunk_t*))allocate_hash384;
-			break;
-		case HASH_SHA512:
-			this = (sha2_hasher_t*)malloc_thing(private_sha512_hasher_t);
-			this->hasher_interface.reset = (void(*)(hasher_t*))reset512;
-			this->hasher_interface.get_state = (chunk_t(*)(hasher_t*))get_state512;
-			this->hasher_interface.get_hash_size = (size_t(*)(hasher_t*))get_hash_size512;
-			this->hasher_interface.get_hash = (void(*)(hasher_t*,chunk_t,u_int8_t*))get_hash512;
-			this->hasher_interface.allocate_hash = (void(*)(hasher_t*,chunk_t,chunk_t*))allocate_hash512;
-			break;
-		default:
-			return NULL;
-	}
-	this->hasher_interface.destroy = (void(*)(hasher_t*))destroy;
-	
-	/* initialize */
-	this->hasher_interface.reset(&this->hasher_interface);
-	
-	return this;
-}
diff --git a/src/libstrongswan/crypto/hashers/sha2_hasher.h b/src/libstrongswan/crypto/hashers/sha2_hasher.h
deleted file mode 100644
index 91e82fedb..000000000
--- a/src/libstrongswan/crypto/hashers/sha2_hasher.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @file sha2_hasher.h
- * 
- * @brief Interface of sha2_hasher_t
- * 
- */
-
-/*
- * Copyright (C) 2006 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#ifndef SHA2_HASHER_H_
-#define SHA2_HASHER_H_
-
-typedef struct sha2_hasher_t sha2_hasher_t;
-
-#include <crypto/hashers/hasher.h>
-
-/**
- * @brief Implementation of hasher_t interface using the SHA2 algorithms.
- *
- * SHA2 is an other name for the SHA-256, SHA-384 and SHA-512 variants of
- * the SHA hash algorithm.
- *
- * @b Constructors:
- * - hasher_create() using HASH_SHA256, HASH_SHA384 or HASH_SHA512 as algorithm
- * - sha2_hasher_create()
- *
- * @see hasher_t
- * 
- * @ingroup hashers
- */
-struct sha2_hasher_t {
-	
-	/**
-	 * Generic hasher_t interface for this hasher.
-	 */
-	hasher_t hasher_interface;
-};
-
-/**
- * @brief Creates a new sha2_hasher_t.
- * 
- * @param	algorithm	HASH_SHA256, HASH_SHA384 or HASH_SHA512
- * @return				sha2_hasher_t object
- * 
- * @ingroup hashers
- */
-sha2_hasher_t *sha2_hasher_create(hash_algorithm_t algorithm);
-
-#endif /* SHA2_HASHER_H_ */