3 files changed, 28 insertions, 19 deletions

diff --git a/src/libstrongswan/plugins/hmac/Makefile.in b/src/libstrongswan/plugins/hmac/Makefile.in
index 72cc23b72..b9e2cd817 100644
--- a/src/libstrongswan/plugins/hmac/Makefile.in
+++ b/src/libstrongswan/plugins/hmac/Makefile.in
@@ -241,6 +241,8 @@ nm_ca_dir = @nm_ca_dir@
 oldincludedir = @oldincludedir@
 openac_plugins = @openac_plugins@
 p_plugins = @p_plugins@
+pcsclite_CFLAGS = @pcsclite_CFLAGS@
+pcsclite_LIBS = @pcsclite_LIBS@
 pdfdir = @pdfdir@
 piddir = @piddir@
 pki_plugins = @pki_plugins@
@@ -264,6 +266,7 @@ soup_LIBS = @soup_LIBS@
 srcdir = @srcdir@
 strongswan_conf = @strongswan_conf@
 sysconfdir = @sysconfdir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
diff --git a/src/libstrongswan/plugins/hmac/hmac.c b/src/libstrongswan/plugins/hmac/hmac.c
index c7b2739df..397a1ea11 100644
--- a/src/libstrongswan/plugins/hmac/hmac.c
+++ b/src/libstrongswan/plugins/hmac/hmac.c
@@ -147,8 +147,8 @@ METHOD(hmac_t, destroy, void,
 	private_hmac_t *this)
 {
 	this->h->destroy(this->h);
-	free(this->opaded_key.ptr);
-	free(this->ipaded_key.ptr);
+	chunk_clear(&this->opaded_key);
+	chunk_clear(&this->ipaded_key);
 	free(this);
 }
 
diff --git a/src/libstrongswan/plugins/hmac/hmac_plugin.c b/src/libstrongswan/plugins/hmac/hmac_plugin.c
index 76d6157ae..47d6d3cde 100644
--- a/src/libstrongswan/plugins/hmac/hmac_plugin.c
+++ b/src/libstrongswan/plugins/hmac/hmac_plugin.c
@@ -19,8 +19,6 @@
 #include "hmac_signer.h"
 #include "hmac_prf.h"
 
-static const char *plugin_name = "hmac";
-
 typedef struct private_hmac_plugin_t private_hmac_plugin_t;
 
 /**
@@ -34,6 +32,12 @@ struct private_hmac_plugin_t {
 	hmac_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+	private_hmac_plugin_t *this)
+{
+	return "hmac";
+}
+
 METHOD(plugin_t, destroy, void,
 	private_hmac_plugin_t *this)
 {
@@ -55,6 +59,8 @@ plugin_t *hmac_plugin_create()
 	INIT(this,
 		.public = {
 			.plugin = {
+				.get_name = _get_name,
+				.reload = (void*)return_false,
 				.destroy = _destroy,
 			},
 		},
@@ -64,24 +70,24 @@ plugin_t *hmac_plugin_create()
 	if (hasher)
 	{
 		hasher->destroy(hasher);
-		lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA1, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_256_256, get_name(this),
 						(signer_constructor_t)hmac_signer_create);
 
 	}
@@ -89,31 +95,31 @@ plugin_t *hmac_plugin_create()
 	if (hasher)
 	{
 		hasher->destroy(hasher);
-		lib->crypto->add_prf(lib->crypto, PRF_HMAC_MD5, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		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, plugin_name,
+		lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_512_256, get_name(this),
 						(signer_constructor_t)hmac_signer_create);
 	}