Removed xauth-null dummy plugin.

7 files changed, 1 insertions, 314 deletions

diff --git a/configure.in b/configure.in
index 743500e28..5ab5417a8 100755
--- a/configure.in
+++ b/configure.in
@@ -193,7 +193,6 @@ ARG_ENABL_SET([duplicheck],     [advanced duplicate checking plugin using livene
 ARG_ENABL_SET([coupling],       [enable IKEv2 plugin to couple peer certificates permanently to authentication.])
 ARG_ENABL_SET([vstr],           [enforce using the Vstr string library to replace glibc-like printf hooks.])
 ARG_ENABL_SET([monolithic],     [build monolithic version of libstrongswan that includes all enabled plugins. Similarly, the plugins of charon are assembled in libcharon.])
-ARG_ENABL_SET([xauth-null],     [enable XAuth module which does no actual identity authentication (testing only).])
 
 dnl =========================
 dnl  set up compiler and flags
@@ -865,7 +864,6 @@ ADD_PLUGIN([maemo],                [c libcharon])
 ADD_PLUGIN([uci],                  [c libcharon])
 ADD_PLUGIN([addrblock],            [c libcharon])
 ADD_PLUGIN([unit-tester],          [c libcharon])
-ADD_PLUGIN([xauth-null],           [c libcharon])
 
 AC_SUBST(libcharon_plugins)
 AC_SUBST(pluto_plugins)
@@ -981,7 +979,6 @@ AM_CONDITIONAL(USE_SOCKET_RAW, test x$socket_raw = xtrue)
 AM_CONDITIONAL(USE_SOCKET_DYNAMIC, test x$socket_dynamic = xtrue)
 AM_CONDITIONAL(USE_FARP, test x$farp = xtrue)
 AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue)
-AM_CONDITIONAL(USE_XAUTH_NULL, test x$xauth_null = xtrue)
 
 dnl hydra plugins
 dnl =============
@@ -1173,7 +1170,6 @@ AC_OUTPUT(
 	src/libcharon/plugins/dhcp/Makefile
 	src/libcharon/plugins/unit_tester/Makefile
 	src/libcharon/plugins/load_tester/Makefile
-	src/libcharon/plugins/xauth_null/Makefile
 	src/stroke/Makefile
 	src/ipsec/Makefile
 	src/starter/Makefile
diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 1b4469649..4c6718340 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -503,9 +503,4 @@ if MONOLITHIC
 endif
 endif
 
-if USE_XAUTH_NULL
-  SUBDIRS += plugins/xauth_null
-if MONOLITHIC
-  libcharon_la_LIBADD += plugins/xauth_null/libstrongswan-xauth-null.la
-endif
-endif
+
diff --git a/src/libcharon/plugins/xauth_null/Makefile.am b/src/libcharon/plugins/xauth_null/Makefile.am
deleted file mode 100644
index f4ff03c47..000000000
--- a/src/libcharon/plugins/xauth_null/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-	-I$(top_srcdir)/src/libcharon
-
-AM_CFLAGS = -rdynamic
-
-if MONOLITHIC
-noinst_LTLIBRARIES = libstrongswan-xauth-null.la
-else
-plugin_LTLIBRARIES = libstrongswan-xauth-null.la
-endif
-
-libstrongswan_xauth_null_la_SOURCES = \
-	xauth_null_plugin.h xauth_null_plugin.c xauth_null.h xauth_null.c
-
-libstrongswan_xauth_null_la_LDFLAGS = -module -avoid-version
diff --git a/src/libcharon/plugins/xauth_null/xauth_null.c b/src/libcharon/plugins/xauth_null/xauth_null.c
deleted file mode 100644
index 86edc14e7..000000000
--- a/src/libcharon/plugins/xauth_null/xauth_null.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "xauth_null.h"
-
-#include <daemon.h>
-#include <library.h>
-
-typedef struct private_xauth_null_t private_xauth_null_t;
-
-/**
- * Private data of an xauth_null_t object.
- */
-struct private_xauth_null_t {
-
-	/**
-	 * Public authenticator_t interface.
-	 */
-	xauth_null_t public;
-};
-
-METHOD(xauth_method_t, process_peer, status_t,
-	private_xauth_null_t *this, cp_payload_t *in, cp_payload_t **out)
-{
-	chunk_t user_name = chunk_from_chars('t', 'e', 's', 't');
-	chunk_t user_pass = chunk_from_chars('t', 'e', 's', 't');
-	cp_payload_t *cp;
-
-	cp = cp_payload_create_type(CONFIGURATION_V1, CFG_REPLY);
-	cp->add_attribute(cp, configuration_attribute_create_chunk(
-				CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_NAME, user_name));
-	cp->add_attribute(cp, configuration_attribute_create_chunk(
-				CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_PASSWORD, user_pass));
-	*out = cp;
-	return NEED_MORE;
-}
-
-METHOD(xauth_method_t, initiate_peer, status_t,
-	private_xauth_null_t *this, cp_payload_t **out)
-{
-	/* peer never initiates */
-	return FAILED;
-}
-
-METHOD(xauth_method_t, process_server, status_t,
-	private_xauth_null_t *this, cp_payload_t *in, cp_payload_t **out)
-{
-	/* always successful */
-	return SUCCESS;
-}
-
-METHOD(xauth_method_t, initiate_server, status_t,
-	private_xauth_null_t *this, cp_payload_t **out)
-{
-	cp_payload_t *cp;
-
-	cp = cp_payload_create_type(CONFIGURATION_V1, CFG_REQUEST);
-	cp->add_attribute(cp, configuration_attribute_create_chunk(
-				CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_NAME, chunk_empty));
-	cp->add_attribute(cp, configuration_attribute_create_chunk(
-				CONFIGURATION_ATTRIBUTE_V1, XAUTH_USER_PASSWORD, chunk_empty));
-
-	*out = cp;
-	return NEED_MORE;
-}
-
-METHOD(xauth_method_t, destroy, void,
-	private_xauth_null_t *this)
-{
-	free(this);
-}
-
-/*
- * Described in header.
- */
-xauth_null_t *xauth_null_create_peer(identification_t *server,
-									 identification_t *peer)
-{
-	private_xauth_null_t *this;
-
-	INIT(this,
-		.public =  {
-			.xauth_method = {
-				.initiate = _initiate_peer,
-				.process = _process_peer,
-				.destroy = _destroy,
-			},
-		},
-	);
-
-	return &this->public;
-}
-
-/*
- * Described in header.
- */
-xauth_null_t *xauth_null_create_server(identification_t *server,
-										   identification_t *peer)
-{
-	private_xauth_null_t *this;
-
-	INIT(this,
-		.public = {
-			.xauth_method = {
-				.initiate = _initiate_server,
-				.process = _process_server,
-				.destroy = _destroy,
-			},
-		},
-	);
-
-	return &this->public;
-}
diff --git a/src/libcharon/plugins/xauth_null/xauth_null.h b/src/libcharon/plugins/xauth_null/xauth_null.h
deleted file mode 100644
index 1d3c34002..000000000
--- a/src/libcharon/plugins/xauth_null/xauth_null.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2008 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup xauth_null_i xauth_null
- * @{ @ingroup xauth_null
- */
-
-#ifndef XAUTH_NULL_H_
-#define XAUTH_NULL_H_
-
-typedef struct xauth_null_t xauth_null_t;
-
-#include <sa/authenticators/xauth/xauth_method.h>
-
-/**
- * Implementation of the xauth_method_t providing no actual identity verification.
- */
-struct xauth_null_t {
-
-	/**
-	 * Implemented xauth_method_t interface.
-	 */
-	xauth_method_t xauth_method;
-};
-
-/**
- * Creates the XAuth method XAuth NULL, acting as server.
- *
- * @param server	ID of the XAuth server
- * @param peer		ID of the XAuth client
- * @return			xauth_null_t object
- */
-xauth_null_t *xauth_null_create_server(identification_t *server,
-									   identification_t *peer);
-
-/**
- * Creates the XAuth method XAuth NULL, acting as peer.
- *
- * @param server	ID of the XAuth server
- * @param peer		ID of the XAuth client
- * @return			xauth_null_t object
- */
-xauth_null_t *xauth_null_create_peer(identification_t *server,
-									 identification_t *peer);
-
-#endif /** XAUTH_NULL_H_ @}*/
diff --git a/src/libcharon/plugins/xauth_null/xauth_null_plugin.c b/src/libcharon/plugins/xauth_null/xauth_null_plugin.c
deleted file mode 100644
index 28ea7af8d..000000000
--- a/src/libcharon/plugins/xauth_null/xauth_null_plugin.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2008 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "xauth_null_plugin.h"
-#include "xauth_null.h"
-
-#include <daemon.h>
-
-METHOD(plugin_t, get_name, char*,
-	xauth_null_plugin_t *this)
-{
-	return "xauth-null";
-}
-
-METHOD(plugin_t, get_features, int,
-	xauth_null_plugin_t *this, plugin_feature_t *features[])
-{
-	static plugin_feature_t f[] = {
-		PLUGIN_CALLBACK(xauth_method_register, xauth_null_create_server),
-			PLUGIN_PROVIDE(XAUTH_SERVER, "null"),
-		PLUGIN_CALLBACK(xauth_method_register, xauth_null_create_peer),
-			PLUGIN_PROVIDE(XAUTH_PEER, "null"),
-	};
-	*features = f;
-	return countof(f);
-}
-
-METHOD(plugin_t, destroy, void,
-	xauth_null_plugin_t *this)
-{
-	free(this);
-}
-
-/*
- * see header file
- */
-plugin_t *xauth_null_plugin_create()
-{
-	xauth_null_plugin_t *this;
-
-	INIT(this,
-		.plugin = {
-			.get_name = _get_name,
-			.get_features = _get_features,
-			.destroy = _destroy,
-		},
-	);
-
-	return &this->plugin;
-}
diff --git a/src/libcharon/plugins/xauth_null/xauth_null_plugin.h b/src/libcharon/plugins/xauth_null/xauth_null_plugin.h
deleted file mode 100644
index 55f4ae19b..000000000
--- a/src/libcharon/plugins/xauth_null/xauth_null_plugin.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2008 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup xauth_null xauth_null
- * @ingroup cplugins
- *
- * @defgroup xauth_null_plugin xauth_null_plugin
- * @{ @ingroup xauth_null
- */
-
-#ifndef XAUTH_NULL_PLUGIN_H_
-#define XAUTH_NULL_PLUGIN_H_
-
-#include <plugins/plugin.h>
-
-typedef struct xauth_null_plugin_t xauth_null_plugin_t;
-
-/**
- * XAUTH Null plugin.
- */
-struct xauth_null_plugin_t {
-
-	/**
-	 * implements plugin interface
-	 */
-	plugin_t plugin;
-};
-
-#endif /** XAUTH_NULL_PLUGIN_H_ @}*/