3 files changed, 19 insertions, 33 deletions

diff --git a/src/libstrongswan/plugins/xcbc/Makefile.in b/src/libstrongswan/plugins/xcbc/Makefile.in
index 22b3c9543..35f868de4 100644
--- a/src/libstrongswan/plugins/xcbc/Makefile.in
+++ b/src/libstrongswan/plugins/xcbc/Makefile.in
@@ -220,13 +220,7 @@ includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 ipsecdir = @ipsecdir@
-<<<<<<< HEAD
-ipsecgid = @ipsecgid@
 ipsecgroup = @ipsecgroup@
-ipsecuid = @ipsecuid@
-=======
-ipsecgroup = @ipsecgroup@
->>>>>>> upstream/4.5.1
 ipsecuser = @ipsecuser@
 libcharon_plugins = @libcharon_plugins@
 libdir = @libdir@
@@ -247,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@
@@ -265,14 +261,12 @@ sbindir = @sbindir@
 scepclient_plugins = @scepclient_plugins@
 scripts_plugins = @scripts_plugins@
 sharedstatedir = @sharedstatedir@
-<<<<<<< HEAD
-=======
 soup_CFLAGS = @soup_CFLAGS@
 soup_LIBS = @soup_LIBS@
->>>>>>> upstream/4.5.1
 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/xcbc/xcbc.c b/src/libstrongswan/plugins/xcbc/xcbc.c
index be18d92b8..8ddde962c 100644
--- a/src/libstrongswan/plugins/xcbc/xcbc.c
+++ b/src/libstrongswan/plugins/xcbc/xcbc.c
@@ -236,13 +236,17 @@ METHOD(xcbc_t, set_key, void,
 	memset(k1.ptr, 0x01, this->b);
 	this->k1->encrypt(this->k1, k1, iv, NULL);
 	this->k1->set_key(this->k1, k1);
+
+	memwipe(k1.ptr, k1.len);
 }
 
 METHOD(xcbc_t, destroy, void,
 	private_xcbc_t *this)
 {
 	this->k1->destroy(this->k1);
+	memwipe(this->k2, this->b);
 	free(this->k2);
+	memwipe(this->k3, this->b);
 	free(this->k3);
 	free(this->e);
 	free(this->remaining);
diff --git a/src/libstrongswan/plugins/xcbc/xcbc_plugin.c b/src/libstrongswan/plugins/xcbc/xcbc_plugin.c
index 19d5a03fe..0fcb093c8 100644
--- a/src/libstrongswan/plugins/xcbc/xcbc_plugin.c
+++ b/src/libstrongswan/plugins/xcbc/xcbc_plugin.c
@@ -19,11 +19,6 @@
 #include "xcbc_signer.h"
 #include "xcbc_prf.h"
 
-<<<<<<< HEAD
-=======
-static const char *plugin_name = "xcbc";
-
->>>>>>> upstream/4.5.1
 typedef struct private_xcbc_plugin_t private_xcbc_plugin_t;
 
 /**
@@ -37,6 +32,12 @@ struct private_xcbc_plugin_t {
 	xcbc_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+	private_xcbc_plugin_t *this)
+{
+	return "xcbc";
+}
+
 METHOD(plugin_t, destroy, void,
 	private_xcbc_plugin_t *this)
 {
@@ -53,49 +54,36 @@ METHOD(plugin_t, destroy, void,
 plugin_t *xcbc_plugin_create()
 {
 	private_xcbc_plugin_t *this;
-<<<<<<< HEAD
-=======
 	crypter_t *crypter;
->>>>>>> upstream/4.5.1
 
 	INIT(this,
 		.public = {
 			.plugin = {
+				.get_name = _get_name,
+				.reload = (void*)return_false,
 				.destroy = _destroy,
 			},
 		},
 	);
 
-<<<<<<< HEAD
-	lib->crypto->add_prf(lib->crypto, PRF_AES128_XCBC,
-					(prf_constructor_t)xcbc_prf_create);
-	lib->crypto->add_prf(lib->crypto, PRF_CAMELLIA128_XCBC,
-					(prf_constructor_t)xcbc_prf_create);
-	lib->crypto->add_signer(lib->crypto, AUTH_AES_XCBC_96,
-					(signer_constructor_t)xcbc_signer_create);
-	lib->crypto->add_signer(lib->crypto, AUTH_CAMELLIA_XCBC_96,
-					(signer_constructor_t)xcbc_signer_create);
-
-=======
 	crypter = lib->crypto->create_crypter(lib->crypto, ENCR_AES_CBC, 16);
 	if (crypter)
 	{
 		crypter->destroy(crypter);
-		lib->crypto->add_prf(lib->crypto, PRF_AES128_XCBC, plugin_name,
+		lib->crypto->add_prf(lib->crypto, PRF_AES128_XCBC, get_name(this),
 						(prf_constructor_t)xcbc_prf_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_AES_XCBC_96, plugin_name,
+		lib->crypto->add_signer(lib->crypto, AUTH_AES_XCBC_96, get_name(this),
 						(signer_constructor_t)xcbc_signer_create);
 	}
 	crypter = lib->crypto->create_crypter(lib->crypto, ENCR_CAMELLIA_CBC, 16);
 	if (crypter)
 	{
 		crypter->destroy(crypter);
-		lib->crypto->add_prf(lib->crypto, PRF_CAMELLIA128_XCBC, plugin_name,
+		lib->crypto->add_prf(lib->crypto, PRF_CAMELLIA128_XCBC, get_name(this),
 						(prf_constructor_t)xcbc_prf_create);
-		lib->crypto->add_signer(lib->crypto, AUTH_CAMELLIA_XCBC_96, plugin_name,
+		lib->crypto->add_signer(lib->crypto, AUTH_CAMELLIA_XCBC_96, get_name(this),
 						(signer_constructor_t)xcbc_signer_create);
 	}
->>>>>>> upstream/4.5.1
 	return &this->public.plugin;
 }