Imported Upstream version 5.3.4

2 files changed, 66 insertions, 13 deletions

diff --git a/src/libstrongswan/crypto/hashers/hasher.c b/src/libstrongswan/crypto/hashers/hasher.c
index 38eebea9c..e220593d4 100644
--- a/src/libstrongswan/crypto/hashers/hasher.c
+++ b/src/libstrongswan/crypto/hashers/hasher.c
@@ -1,8 +1,9 @@
 /*
  * Copyright (C) 2012-2015 Tobias Brunner
+ * Copyright (C) 2015 Andreas Steffen
  * Copyright (C) 2005-2006 Martin Willi
  * Copyright (C) 2005 Jan Hutter
- * Hochschule fuer Technik Rapperswil
+ * HSR 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
@@ -24,26 +25,34 @@ ENUM_BEGIN(hash_algorithm_names, HASH_SHA1, HASH_SHA512,
 	"HASH_SHA256",
 	"HASH_SHA384",
 	"HASH_SHA512");
-ENUM_NEXT(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA224, HASH_SHA512,
+ENUM_NEXT(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA3_512, HASH_SHA512,
 	"HASH_UNKNOWN",
 	"HASH_MD2",
 	"HASH_MD4",
 	"HASH_MD5",
-	"HASH_SHA224");
-ENUM_END(hash_algorithm_names, HASH_SHA224);
+	"HASH_SHA224",
+	"HASH_SHA3_224",
+	"HASH_SHA3_256",
+	"HASH_SHA3_384",
+	"HASH_SHA3_512");
+ENUM_END(hash_algorithm_names, HASH_SHA3_512);
 
 ENUM_BEGIN(hash_algorithm_short_names, HASH_SHA1, HASH_SHA512,
 	"sha1",
 	"sha256",
 	"sha384",
 	"sha512");
-ENUM_NEXT(hash_algorithm_short_names, HASH_UNKNOWN, HASH_SHA224, HASH_SHA512,
+ENUM_NEXT(hash_algorithm_short_names, HASH_UNKNOWN, HASH_SHA3_512, HASH_SHA512,
 	"unknown",
 	"md2",
 	"md4",
 	"md5",
-	"sha224");
-ENUM_END(hash_algorithm_short_names, HASH_SHA224);
+	"sha224",
+	"sha3_224",
+	"sha3_256",
+	"sha3_384",
+	"sha3_512");
+ENUM_END(hash_algorithm_short_names, HASH_SHA3_512);
 
 /*
  * Described in header.
@@ -73,6 +82,14 @@ hash_algorithm_t hasher_algorithm_from_oid(int oid)
 		case OID_SHA512:
 		case OID_SHA512_WITH_RSA:
 			return HASH_SHA512;
+		case OID_SHA3_224:
+			return HASH_SHA3_224;
+		case OID_SHA3_256:
+			return HASH_SHA3_256;
+		case OID_SHA3_384:
+			return HASH_SHA3_384;
+		case OID_SHA3_512:
+			return HASH_SHA3_512;
 		default:
 			return HASH_UNKNOWN;
 	}
@@ -242,6 +259,10 @@ integrity_algorithm_t hasher_algorithm_to_integrity(hash_algorithm_t alg,
 		case HASH_MD2:
 		case HASH_MD4:
 		case HASH_SHA224:
+		case HASH_SHA3_224:
+		case HASH_SHA3_256:
+		case HASH_SHA3_384:
+		case HASH_SHA3_512:
 		case HASH_UNKNOWN:
 			break;
 	}
@@ -265,6 +286,10 @@ bool hasher_algorithm_for_ikev2(hash_algorithm_t alg)
 		case HASH_MD4:
 		case HASH_MD5:
 		case HASH_SHA224:
+		case HASH_SHA3_224:
+		case HASH_SHA3_256:
+		case HASH_SHA3_384:
+		case HASH_SHA3_512:
 			break;
 	}
 	return FALSE;
@@ -300,6 +325,18 @@ int hasher_algorithm_to_oid(hash_algorithm_t alg)
 		case HASH_SHA512:
 			oid = OID_SHA512;
 			break;
+		case HASH_SHA3_224:
+			oid = OID_SHA3_224;
+			break;
+		case HASH_SHA3_256:
+			oid = OID_SHA3_256;
+			break;
+		case HASH_SHA3_384:
+			oid = OID_SHA3_384;
+			break;
+		case HASH_SHA3_512:
+			oid = OID_SHA3_512;
+			break;
 		default:
 			oid = OID_UNKNOWN;
 	}
@@ -351,11 +388,17 @@ int hasher_signature_algorithm_to_oid(hash_algorithm_t alg, key_type_t key)
 			switch (alg)
 			{
 				case HASH_SHA256:
-					return OID_BLISS_WITH_SHA256;
+					return OID_BLISS_WITH_SHA2_256;
 				case HASH_SHA384:
-					return OID_BLISS_WITH_SHA384;
+					return OID_BLISS_WITH_SHA2_384;
 				case HASH_SHA512:
-					return OID_BLISS_WITH_SHA512;
+					return OID_BLISS_WITH_SHA2_512;
+				case HASH_SHA3_256:
+					return OID_BLISS_WITH_SHA3_256;
+				case HASH_SHA3_384:
+					return OID_BLISS_WITH_SHA3_384;
+				case HASH_SHA3_512:
+					return OID_BLISS_WITH_SHA3_512;
 				default:
 					return OID_UNKNOWN;
 			}
@@ -385,18 +428,24 @@ hash_algorithm_t hasher_from_signature_scheme(signature_scheme_t scheme)
 		case SIGN_RSA_EMSA_PKCS1_SHA256:
 		case SIGN_ECDSA_WITH_SHA256_DER:
 		case SIGN_ECDSA_256:
-		case SIGN_BLISS_WITH_SHA256:
+		case SIGN_BLISS_WITH_SHA2_256:
 			return HASH_SHA256;
 		case SIGN_RSA_EMSA_PKCS1_SHA384:
 		case SIGN_ECDSA_WITH_SHA384_DER:
 		case SIGN_ECDSA_384:
-		case SIGN_BLISS_WITH_SHA384:
+		case SIGN_BLISS_WITH_SHA2_384:
 			return HASH_SHA384;
 		case SIGN_RSA_EMSA_PKCS1_SHA512:
 		case SIGN_ECDSA_WITH_SHA512_DER:
 		case SIGN_ECDSA_521:
-		case SIGN_BLISS_WITH_SHA512:
+		case SIGN_BLISS_WITH_SHA2_512:
 			return HASH_SHA512;
+		case SIGN_BLISS_WITH_SHA3_256:
+			return HASH_SHA3_256;
+		case SIGN_BLISS_WITH_SHA3_384:
+			return HASH_SHA3_384;
+		case SIGN_BLISS_WITH_SHA3_512:
+			return HASH_SHA3_512;
 	}
 	return HASH_UNKNOWN;
 }
diff --git a/src/libstrongswan/crypto/hashers/hasher.h b/src/libstrongswan/crypto/hashers/hasher.h
index 772586308..272502cf0 100644
--- a/src/libstrongswan/crypto/hashers/hasher.h
+++ b/src/libstrongswan/crypto/hashers/hasher.h
@@ -45,6 +45,10 @@ enum hash_algorithm_t {
 	HASH_MD4			= 1026,
 	HASH_MD5 			= 1027,
 	HASH_SHA224			= 1028,
+	HASH_SHA3_224		= 1029,
+	HASH_SHA3_256		= 1030,
+	HASH_SHA3_384		= 1031,
+	HASH_SHA3_512		= 1032
 };
 
 #define HASH_SIZE_MD2		16