diff options
Diffstat (limited to 'src/libstrongswan/plugins/test_vectors')
| -rw-r--r-- | src/libstrongswan/plugins/test_vectors/Makefile.in | 9 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c | 18 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/test_vectors/Makefile.in b/src/libstrongswan/plugins/test_vectors/Makefile.in index 9be3f825a..651fb8a9f 100644 --- a/src/libstrongswan/plugins/test_vectors/Makefile.in +++ b/src/libstrongswan/plugins/test_vectors/Makefile.in @@ -227,9 +227,13 @@ 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@ @@ -268,6 +272,11 @@ 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@ diff --git a/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c b/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c index f3a254d8d..c021ef67b 100644 --- a/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c +++ b/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c @@ -104,10 +104,15 @@ struct private_test_vectors_plugin_t { test_vectors_plugin_t public; }; +<<<<<<< HEAD /** * Implementation of test_vectors_plugin_t.test_vectorstroy */ static void destroy(private_test_vectors_plugin_t *this) +======= +METHOD(plugin_t, destroy, void, + private_test_vectors_plugin_t *this) +>>>>>>> upstream/4.5.1 { free(this); } @@ -117,10 +122,23 @@ static void destroy(private_test_vectors_plugin_t *this) */ plugin_t *test_vectors_plugin_create() { +<<<<<<< HEAD private_test_vectors_plugin_t *this = malloc_thing(private_test_vectors_plugin_t); int i; this->public.plugin.destroy = (void(*)(plugin_t*))destroy; +======= + private_test_vectors_plugin_t *this; + int i; + + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + ); +>>>>>>> upstream/4.5.1 for (i = 0; i < countof(crypter); i++) { |