Imported Upstream version 4.6.4

4 files changed, 53 insertions, 67 deletions

diff --git a/src/libstrongswan/plugins/hmac/Makefile.in b/src/libstrongswan/plugins/hmac/Makefile.in
index b9e2cd817..5242764d4 100644
--- a/src/libstrongswan/plugins/hmac/Makefile.in
+++ b/src/libstrongswan/plugins/hmac/Makefile.in
@@ -192,6 +192,9 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+attest_plugins = @attest_plugins@
+axis2c_CFLAGS = @axis2c_CFLAGS@
+axis2c_LIBS = @axis2c_LIBS@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -200,6 +203,7 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 c_plugins = @c_plugins@
+clearsilver_LIBS = @clearsilver_LIBS@
 datadir = @datadir@
 datarootdir = @datarootdir@
 dbusservicedir = @dbusservicedir@
@@ -216,11 +220,13 @@ host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
+imcvdir = @imcvdir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 ipsecdir = @ipsecdir@
 ipsecgroup = @ipsecgroup@
+ipseclibdir = @ipseclibdir@
 ipsecuser = @ipsecuser@
 libcharon_plugins = @libcharon_plugins@
 libdir = @libdir@
@@ -264,6 +270,7 @@ sharedstatedir = @sharedstatedir@
 soup_CFLAGS = @soup_CFLAGS@
 soup_LIBS = @soup_LIBS@
 srcdir = @srcdir@
+starter_plugins = @starter_plugins@
 strongswan_conf = @strongswan_conf@
 sysconfdir = @sysconfdir@
 systemdsystemunitdir = @systemdsystemunitdir@
diff --git a/src/libstrongswan/plugins/hmac/hmac.c b/src/libstrongswan/plugins/hmac/hmac.c
index 397a1ea11..91294305e 100644
--- a/src/libstrongswan/plugins/hmac/hmac.c
+++ b/src/libstrongswan/plugins/hmac/hmac.c
@@ -4,13 +4,13 @@
  * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General hmac License as published by the
+ * 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 hmac License
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  */
 
diff --git a/src/libstrongswan/plugins/hmac/hmac.h b/src/libstrongswan/plugins/hmac/hmac.h
index be1bce66d..1ed041596 100644
--- a/src/libstrongswan/plugins/hmac/hmac.h
+++ b/src/libstrongswan/plugins/hmac/hmac.h
@@ -29,8 +29,8 @@ typedef struct hmac_t hmac_t;
 /**
  * Message authentication using hash functions.
  *
- * This class implements the message authenticaion algorithm
- * described in RFC2104. It uses a hash function, wich must
+ * This class implements the message authentication algorithm
+ * described in RFC2104. It uses a hash function, which must
  * be implemented as a hasher_t class.
  */
 struct hmac_t {
diff --git a/src/libstrongswan/plugins/hmac/hmac_plugin.c b/src/libstrongswan/plugins/hmac/hmac_plugin.c
index 47d6d3cde..7d9ff3c67 100644
--- a/src/libstrongswan/plugins/hmac/hmac_plugin.c
+++ b/src/libstrongswan/plugins/hmac/hmac_plugin.c
@@ -38,13 +38,50 @@ METHOD(plugin_t, get_name, char*,
 	return "hmac";
 }
 
+METHOD(plugin_t, get_features, int,
+	private_hmac_plugin_t *this, plugin_feature_t *features[])
+{
+	static plugin_feature_t f[] = {
+		PLUGIN_REGISTER(PRF, hmac_prf_create),
+			PLUGIN_PROVIDE(PRF, PRF_HMAC_SHA1),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA1),
+			PLUGIN_PROVIDE(PRF, PRF_HMAC_MD5),
+				PLUGIN_DEPENDS(HASHER,  HASH_MD5),
+			PLUGIN_PROVIDE(PRF, PRF_HMAC_SHA2_256),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA256),
+			PLUGIN_PROVIDE(PRF, PRF_HMAC_SHA2_384),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA384),
+			PLUGIN_PROVIDE(PRF, PRF_HMAC_SHA2_512),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA512),
+		PLUGIN_REGISTER(SIGNER, hmac_signer_create),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_SHA1_96),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA1),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_SHA1_128),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA1),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_SHA1_160),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA1),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_MD5_96),
+				PLUGIN_DEPENDS(HASHER,  HASH_MD5),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_MD5_128),
+				PLUGIN_DEPENDS(HASHER,  HASH_MD5),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_SHA2_256_128),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA256),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_SHA2_256_256),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA256),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_SHA2_384_192),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA384),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_SHA2_384_384),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA384),
+			PLUGIN_PROVIDE(SIGNER, AUTH_HMAC_SHA2_512_256),
+				PLUGIN_DEPENDS(HASHER,  HASH_SHA512),
+	};
+	*features = f;
+	return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
 	private_hmac_plugin_t *this)
 {
-	lib->crypto->remove_prf(lib->crypto,
-							(prf_constructor_t)hmac_prf_create);
-	lib->crypto->remove_signer(lib->crypto,
-							   (signer_constructor_t)hmac_signer_create);
 	free(this);
 }
 
@@ -54,75 +91,17 @@ METHOD(plugin_t, destroy, void,
 plugin_t *hmac_plugin_create()
 {
 	private_hmac_plugin_t *this;
-	hasher_t *hasher;
 
 	INIT(this,
 		.public = {
 			.plugin = {
 				.get_name = _get_name,
-				.reload = (void*)return_false,
+				.get_features = _get_features,
 				.destroy = _destroy,
 			},
 		},
 	);
 
-	hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1);
-	if (hasher)
-	{
-		hasher->destroy(hasher);
-		lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA1, get_name(this),
-						(prf_constructor_t)hmac_prf_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_96, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_128, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_160, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-	}
-	hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA256);
-	if (hasher)
-	{
-		hasher->destroy(hasher);
-		lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_256, get_name(this),
-						(prf_constructor_t)hmac_prf_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_256_128, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_256_256, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-
-	}
-	hasher = lib->crypto->create_hasher(lib->crypto, HASH_MD5);
-	if (hasher)
-	{
-		hasher->destroy(hasher);
-		lib->crypto->add_prf(lib->crypto, PRF_HMAC_MD5, get_name(this),
-						(prf_constructor_t)hmac_prf_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_96, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_128, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-	}
-	hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA384);
-	if (hasher)
-	{
-		hasher->destroy(hasher);
-		lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_384, get_name(this),
-						(prf_constructor_t)hmac_prf_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_384_192, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_384_384, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-	}
-	hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA512);
-	if (hasher)
-	{
-		hasher->destroy(hasher);
-		lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_512, get_name(this),
-						(prf_constructor_t)hmac_prf_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_512_256, get_name(this),
-						(signer_constructor_t)hmac_signer_create);
-	}
-
 	return &this->public.plugin;
 }