Imported Upstream version 5.3.0

2 files changed, 35 insertions, 13 deletions

diff --git a/src/pt-tls-client/Makefile.in b/src/pt-tls-client/Makefile.in
index 7ee25c007..a02db98f2 100644
--- a/src/pt-tls-client/Makefile.in
+++ b/src/pt-tls-client/Makefile.in
@@ -198,6 +198,7 @@ DLLIB = @DLLIB@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
+EASY_INSTALL = @EASY_INSTALL@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -258,10 +259,12 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
 PTHREADLIB = @PTHREADLIB@
 PYTHON = @PYTHON@
+PYTHONEGGINSTALLDIR = @PYTHONEGGINSTALLDIR@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
+PY_TEST = @PY_TEST@
 RANLIB = @RANLIB@
 RTLIB = @RTLIB@
 RUBY = @RUBY@
@@ -335,6 +338,8 @@ json_CFLAGS = @json_CFLAGS@
 json_LIBS = @json_LIBS@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libiptc_CFLAGS = @libiptc_CFLAGS@
+libiptc_LIBS = @libiptc_LIBS@
 linux_headers = @linux_headers@
 localedir = @localedir@
 localstatedir = @localstatedir@
diff --git a/src/pt-tls-client/pt-tls-client.c b/src/pt-tls-client/pt-tls-client.c
index a8d45b54f..3a179af17 100644
--- a/src/pt-tls-client/pt-tls-client.c
+++ b/src/pt-tls-client/pt-tls-client.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010-2013 Martin Willi, revosec AG
- * Copyright (C) 2013-2014 Andreas Steffen
+ * Copyright (C) 2013-2015 Andreas Steffen
  * HSR Hochschule für Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -54,32 +54,44 @@ static int client(char *address, u_int16_t port, char *identity)
 {
 	pt_tls_client_t *assessment;
 	tls_t *tnccs;
-	identification_t *server, *client;
-	host_t *host;
+	identification_t *server_id, *client_id;
+	host_t *server_ip, *client_ip;
 	status_t status;
 
-	host = host_create_from_dns(address, AF_UNSPEC, port);
-	if (!host)
+	server_ip = host_create_from_dns(address, AF_UNSPEC, port);
+	if (!server_ip)
 	{
 		return 1;
 	}
-	server = identification_create_from_string(address);
-	client = identification_create_from_string(identity);
+
+	client_ip = host_create_any(server_ip->get_family(server_ip));
+	if (!client_ip)
+	{
+		server_ip->destroy(server_ip);
+		return 1;
+	}
+	server_id = identification_create_from_string(address);
+	client_id = identification_create_from_string(identity);
+
 	tnccs = (tls_t*)tnc->tnccs->create_instance(tnc->tnccs, TNCCS_2_0, FALSE,
-								server, client, TNC_IFT_TLS_2_0, NULL);
+								server_id, client_id, server_ip, client_ip,
+								TNC_IFT_TLS_2_0, NULL);
+	client_ip->destroy(client_ip);
+
 	if (!tnccs)
 	{
 		fprintf(stderr, "loading TNCCS failed: %s\n", PLUGINS);
-		host->destroy(host);
-		server->destroy(server);
-		client->destroy(client);
+		server_ip->destroy(server_ip);
+		server_id->destroy(server_id);
+		client_id->destroy(client_id);
 		return 1;
 	}
-	assessment = pt_tls_client_create(host, server, client);
+	assessment = pt_tls_client_create(server_ip, server_id, client_id);
 	status = assessment->run_assessment(assessment, (tnccs_t*)tnccs);
 	assessment->destroy(assessment);
 	tnccs->destroy(tnccs);
-	return status;
+
+	return (status != SUCCESS);
 }
 
 
@@ -258,6 +270,7 @@ int main(int argc, char *argv[])
 			{"port",		required_argument,		NULL,		'p' },
 			{"cert",		required_argument,		NULL,		'x' },
 			{"key",			required_argument,		NULL,		'k' },
+			{"mutual",		no_argument,			NULL,		'm' },
 			{"quiet",		no_argument,			NULL,		'q' },
 			{"debug",		required_argument,		NULL,		'd' },
 			{"optionsfrom",	required_argument,		NULL,		'+' },
@@ -299,6 +312,10 @@ int main(int argc, char *argv[])
 			case 'p':			/* --port <port> */
 				port = atoi(optarg);
 				continue;
+			case 'm':			/* --mutual */
+				lib->settings->set_bool(lib->settings,
+								"%s.plugins.tnccs-20.mutual", TRUE, lib->ns);
+				continue;
 			case 'q':       	/* --quiet */
 				log_to_stderr = FALSE;
 				continue;