Imported Upstream version 5.1.2

12 files changed, 22 insertions, 14 deletions

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 08a726041..40001f848 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -264,8 +264,6 @@ BTLIB = @BTLIB@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
 COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
 COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
@@ -333,6 +331,11 @@ PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PTHREADLIB = @PTHREADLIB@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RTLIB = @RTLIB@
 RUBY = @RUBY@
@@ -421,12 +424,16 @@ pcsclite_CFLAGS = @pcsclite_CFLAGS@
 pcsclite_LIBS = @pcsclite_LIBS@
 pdfdir = @pdfdir@
 piddir = @piddir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 pki_plugins = @pki_plugins@
 plugindir = @plugindir@
 pool_plugins = @pool_plugins@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
 random_device = @random_device@
 resolv_conf = @resolv_conf@
 routing_table = @routing_table@
@@ -441,6 +448,7 @@ soup_LIBS = @soup_LIBS@
 srcdir = @srcdir@
 starter_plugins = @starter_plugins@
 strongswan_conf = @strongswan_conf@
+strongswan_options = @strongswan_options@
 sysconfdir = @sysconfdir@
 systemdsystemunitdir = @systemdsystemunitdir@
 t_plugins = @t_plugins@
diff --git a/scripts/aes-test.c b/scripts/aes-test.c
index ddf4a5ded..eb94180f8 100644
--- a/scripts/aes-test.c
+++ b/scripts/aes-test.c
@@ -167,7 +167,7 @@ static bool get_next_test_vector(test_vector_t *test)
 	while (fgets(line, sizeof(line), ctx.in))
 	{
 		enumerator_t *enumerator;
-		chunk_t value;
+		chunk_t value = chunk_empty;
 		char *token;
 		int i;
 
@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
 	ctx.in = stdin;
 	ctx.out = stdout;
 
-	library_init(NULL);
+	library_init(NULL, "aes-test");
 	atexit(library_deinit);
 
 	while (true)
diff --git a/scripts/crypt_burn.c b/scripts/crypt_burn.c
index 8101f9cbd..729472e7d 100644
--- a/scripts/crypt_burn.c
+++ b/scripts/crypt_burn.c
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
 	int i = 0, limit = 0;
 
 
-	library_init(NULL);
+	library_init(NULL, "crypt_burn");
 	lib->plugins->load(lib->plugins, PLUGINS);
 	atexit(library_deinit);
 
diff --git a/scripts/dh_speed.c b/scripts/dh_speed.c
index dc0a2870f..8a782d80b 100644
--- a/scripts/dh_speed.c
+++ b/scripts/dh_speed.c
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
 		usage();
 	}
 
-	library_init(NULL);
+	library_init(NULL, "dh_speed");
 	lib->plugins->load(lib->plugins, argv[1]);
 	atexit(library_deinit);
 
diff --git a/scripts/dnssec.c b/scripts/dnssec.c
index 0cddfc47e..9d35c7cda 100644
--- a/scripts/dnssec.c
+++ b/scripts/dnssec.c
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 	rr_set_t *rrset;
 	rr_t *rr;
 
-	library_init(NULL);
+	library_init(NULL, "dnssec");
 	atexit(library_deinit);
 
 	dbg = dbg_dnssec;
diff --git a/scripts/fetch.c b/scripts/fetch.c
index f58b37f89..a7d98c946 100644
--- a/scripts/fetch.c
+++ b/scripts/fetch.c
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
 {
 	chunk_t res;
 
-	library_init(NULL);
+	library_init(NULL, "fetch");
 	atexit(library_deinit);
 	lib->plugins->load(lib->plugins, PLUGINS);
 
diff --git a/scripts/hash_burn.c b/scripts/hash_burn.c
index 20e5642d4..97eab0d84 100644
--- a/scripts/hash_burn.c
+++ b/scripts/hash_burn.c
@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
 	char buffer[1024];
 	int limit = 0, i = 0;
 
-	library_init(NULL);
+	library_init(NULL, "hash_burn");
 	lib->plugins->load(lib->plugins, PLUGINS);
 	atexit(library_deinit);
 
diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c
index 31f3bee82..e9a4ee692 100644
--- a/scripts/key2keyid.c
+++ b/scripts/key2keyid.c
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 	char buf[8096];
 	int read;
 
-	library_init(NULL);
+	library_init(NULL, "key2keyid");
 	lib->plugins->load(lib->plugins, PLUGINS);
 	atexit(library_deinit);
 
diff --git a/scripts/keyid2sql.c b/scripts/keyid2sql.c
index 6e9a1334e..46257891c 100644
--- a/scripts/keyid2sql.c
+++ b/scripts/keyid2sql.c
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 	char buf[8096];
 	int read, n;
 
-	library_init(NULL);
+	library_init(NULL, "keyid2sql");
 	lib->plugins->load(lib->plugins, PLUGINS);
 	atexit(library_deinit);
 
diff --git a/scripts/malloc_speed.c b/scripts/malloc_speed.c
index 85d51a281..2038098db 100644
--- a/scripts/malloc_speed.c
+++ b/scripts/malloc_speed.c
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 	int sizes[16] = { 1, 13, 100, 1000, 16, 10000, 50, 17,
 					  123, 32, 8, 64, 8096, 1024, 123, 9 };
 
-	library_init(NULL);
+	library_init(NULL, "malloc_speed");
 	atexit(library_deinit);
 
 	print_mallinfo();
diff --git a/scripts/pubkey_speed.c b/scripts/pubkey_speed.c
index f7e75162a..66279ada3 100644
--- a/scripts/pubkey_speed.c
+++ b/scripts/pubkey_speed.c
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
 		usage();
 	}
 
-	library_init(NULL);
+	library_init(NULL, "pubkey_speed");
 	lib->plugins->load(lib->plugins, argv[1]);
 	atexit(library_deinit);
 
diff --git a/scripts/tls_test.c b/scripts/tls_test.c
index e1e8ca82b..7ec477aae 100644
--- a/scripts/tls_test.c
+++ b/scripts/tls_test.c
@@ -251,7 +251,7 @@ static void cleanup()
  */
 static void init()
 {
-	library_init(NULL);
+	library_init(NULL, "tls_test");
 
 	dbg = dbg_tls;