Imported Upstream version 5.1.1

9 files changed, 0 insertions, 2029 deletions

diff --git a/src/libcharon/plugins/tnc_imc/Makefile.am b/src/libcharon/plugins/tnc_imc/Makefile.am
deleted file mode 100644
index 6e2b83fa0..000000000
--- a/src/libcharon/plugins/tnc_imc/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/libstrongswan \
-	-I$(top_srcdir)/src/libhydra \
-	-I$(top_srcdir)/src/libcharon \
-	-I$(top_srcdir)/src/libtncif \
-	-I$(top_srcdir)/src/libtnccs \
-	-I$(top_srcdir)/src/libtls
-
-AM_CFLAGS = \
-	-rdynamic
-
-if MONOLITHIC
-noinst_LTLIBRARIES = libstrongswan-tnc-imc.la
-else
-plugin_LTLIBRARIES = libstrongswan-tnc-imc.la
-libstrongswan_tnc_imc_la_LIBADD = \
-	$(top_builddir)/src/libtncif/libtncif.la \
-	$(top_builddir)/src/libtnccs/libtnccs.la
-endif
-
-libstrongswan_tnc_imc_la_SOURCES = \
-	tnc_imc_plugin.h tnc_imc_plugin.c tnc_imc.h tnc_imc.c \
-	tnc_imc_manager.h tnc_imc_manager.c tnc_imc_bind_function.c
-
-libstrongswan_tnc_imc_la_LDFLAGS = -module -avoid-version
diff --git a/src/libcharon/plugins/tnc_imc/Makefile.in b/src/libcharon/plugins/tnc_imc/Makefile.in
deleted file mode 100644
index 538af847a..000000000
--- a/src/libcharon/plugins/tnc_imc/Makefile.in
+++ /dev/null
@@ -1,698 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/libcharon/plugins/tnc_imc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \
-	$(top_srcdir)/m4/config/ltoptions.m4 \
-	$(top_srcdir)/m4/config/ltsugar.m4 \
-	$(top_srcdir)/m4/config/ltversion.m4 \
-	$(top_srcdir)/m4/config/lt~obsolete.m4 \
-	$(top_srcdir)/m4/macros/with.m4 \
-	$(top_srcdir)/m4/macros/enable-disable.m4 \
-	$(top_srcdir)/m4/macros/add-plugin.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES)
-@MONOLITHIC_FALSE@libstrongswan_tnc_imc_la_DEPENDENCIES =  \
-@MONOLITHIC_FALSE@	$(top_builddir)/src/libtncif/libtncif.la \
-@MONOLITHIC_FALSE@	$(top_builddir)/src/libtnccs/libtnccs.la
-am_libstrongswan_tnc_imc_la_OBJECTS = tnc_imc_plugin.lo tnc_imc.lo \
-	tnc_imc_manager.lo tnc_imc_bind_function.lo
-libstrongswan_tnc_imc_la_OBJECTS =  \
-	$(am_libstrongswan_tnc_imc_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-libstrongswan_tnc_imc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libstrongswan_tnc_imc_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@MONOLITHIC_FALSE@am_libstrongswan_tnc_imc_la_rpath = -rpath \
-@MONOLITHIC_FALSE@	$(plugindir)
-@MONOLITHIC_TRUE@am_libstrongswan_tnc_imc_la_rpath =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libstrongswan_tnc_imc_la_SOURCES)
-DIST_SOURCES = $(libstrongswan_tnc_imc_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BFDLIB = @BFDLIB@
-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@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLIB = @DLLIB@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GENHTML = @GENHTML@
-GPERF = @GPERF@
-GPRBUILD = @GPRBUILD@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LCOV = @LCOV@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MYSQLCFLAG = @MYSQLCFLAG@
-MYSQLCONFIG = @MYSQLCONFIG@
-MYSQLLIB = @MYSQLLIB@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PTHREADLIB = @PTHREADLIB@
-RANLIB = @RANLIB@
-RTLIB = @RTLIB@
-RUBY = @RUBY@
-RUBYINCLUDE = @RUBYINCLUDE@
-RUBYLIB = @RUBYLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SOCKLIB = @SOCKLIB@
-STRIP = @STRIP@
-UNWINDLIB = @UNWINDLIB@
-VERSION = @VERSION@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-attest_plugins = @attest_plugins@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-c_plugins = @c_plugins@
-charon_natt_port = @charon_natt_port@
-charon_plugins = @charon_plugins@
-charon_udp_port = @charon_udp_port@
-clearsilver_LIBS = @clearsilver_LIBS@
-cmd_plugins = @cmd_plugins@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dbusservicedir = @dbusservicedir@
-dev_headers = @dev_headers@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-fips_mode = @fips_mode@
-gtk_CFLAGS = @gtk_CFLAGS@
-gtk_LIBS = @gtk_LIBS@
-h_plugins = @h_plugins@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-imcvdir = @imcvdir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-ipsec_script = @ipsec_script@
-ipsec_script_upper = @ipsec_script_upper@
-ipsecdir = @ipsecdir@
-ipsecgroup = @ipsecgroup@
-ipseclibdir = @ipseclibdir@
-ipsecuser = @ipsecuser@
-libdir = @libdir@
-libexecdir = @libexecdir@
-linux_headers = @linux_headers@
-localedir = @localedir@
-localstatedir = @localstatedir@
-maemo_CFLAGS = @maemo_CFLAGS@
-maemo_LIBS = @maemo_LIBS@
-manager_plugins = @manager_plugins@
-mandir = @mandir@
-medsrv_plugins = @medsrv_plugins@
-mkdir_p = @mkdir_p@
-nm_CFLAGS = @nm_CFLAGS@
-nm_LIBS = @nm_LIBS@
-nm_ca_dir = @nm_ca_dir@
-nm_plugins = @nm_plugins@
-oldincludedir = @oldincludedir@
-openac_plugins = @openac_plugins@
-pcsclite_CFLAGS = @pcsclite_CFLAGS@
-pcsclite_LIBS = @pcsclite_LIBS@
-pdfdir = @pdfdir@
-piddir = @piddir@
-pki_plugins = @pki_plugins@
-plugindir = @plugindir@
-pool_plugins = @pool_plugins@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-random_device = @random_device@
-resolv_conf = @resolv_conf@
-routing_table = @routing_table@
-routing_table_prio = @routing_table_prio@
-s_plugins = @s_plugins@
-sbindir = @sbindir@
-scepclient_plugins = @scepclient_plugins@
-scripts_plugins = @scripts_plugins@
-sharedstatedir = @sharedstatedir@
-soup_CFLAGS = @soup_CFLAGS@
-soup_LIBS = @soup_LIBS@
-srcdir = @srcdir@
-starter_plugins = @starter_plugins@
-strongswan_conf = @strongswan_conf@
-sysconfdir = @sysconfdir@
-systemdsystemunitdir = @systemdsystemunitdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-urandom_device = @urandom_device@
-xml_CFLAGS = @xml_CFLAGS@
-xml_LIBS = @xml_LIBS@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/libstrongswan \
-	-I$(top_srcdir)/src/libhydra \
-	-I$(top_srcdir)/src/libcharon \
-	-I$(top_srcdir)/src/libtncif \
-	-I$(top_srcdir)/src/libtnccs \
-	-I$(top_srcdir)/src/libtls
-
-AM_CFLAGS = \
-	-rdynamic
-
-@MONOLITHIC_TRUE@noinst_LTLIBRARIES = libstrongswan-tnc-imc.la
-@MONOLITHIC_FALSE@plugin_LTLIBRARIES = libstrongswan-tnc-imc.la
-@MONOLITHIC_FALSE@libstrongswan_tnc_imc_la_LIBADD = \
-@MONOLITHIC_FALSE@	$(top_builddir)/src/libtncif/libtncif.la \
-@MONOLITHIC_FALSE@	$(top_builddir)/src/libtnccs/libtnccs.la
-
-libstrongswan_tnc_imc_la_SOURCES = \
-	tnc_imc_plugin.h tnc_imc_plugin.c tnc_imc.h tnc_imc.c \
-	tnc_imc_manager.h tnc_imc_manager.c tnc_imc_bind_function.c
-
-libstrongswan_tnc_imc_la_LDFLAGS = -module -avoid-version
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libcharon/plugins/tnc_imc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/libcharon/plugins/tnc_imc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libstrongswan-tnc-imc.la: $(libstrongswan_tnc_imc_la_OBJECTS) $(libstrongswan_tnc_imc_la_DEPENDENCIES) $(EXTRA_libstrongswan_tnc_imc_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libstrongswan_tnc_imc_la_LINK) $(am_libstrongswan_tnc_imc_la_rpath) $(libstrongswan_tnc_imc_la_OBJECTS) $(libstrongswan_tnc_imc_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnc_imc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnc_imc_bind_function.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnc_imc_manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnc_imc_plugin.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	clean-pluginLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES clean-pluginLTLIBRARIES \
-	ctags distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.c b/src/libcharon/plugins/tnc_imc/tnc_imc.c
deleted file mode 100644
index 9ac578401..000000000
--- a/src/libcharon/plugins/tnc_imc/tnc_imc.c
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (C) 2006 Mike McCauley
- * Copyright (C) 2010-2011 Andreas Steffen,
- * HSR 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 "tnc_imc.h"
-
-#include <dlfcn.h>
-
-#include <tncif_pa_subtypes.h>
-
-#include <utils/debug.h>
-#include <daemon.h>
-#include <library.h>
-#include <collections/linked_list.h>
-#include <threading/mutex.h>
-
-typedef struct private_tnc_imc_t private_tnc_imc_t;
-
-/**
- * Private data of an imc_t object.
- */
-struct private_tnc_imc_t {
-
-	/**
-	 * Public members of imc_t.
-	 */
-	imc_t public;
-
-	/**
-	 * Name of loaded IMC
-	 */
-	char *name;
-
-	/**
-	 * Handle of loaded IMC
-	 */
-	void *handle;
-
-	/**
-	 * ID of loaded IMC
-	 */
-	TNC_IMCID id;
-
-	/**
-	 * list of additional IMC IDs
-	 */
-	linked_list_t *additional_ids;
-
-	/**
-	 * List of message types supported by IMC - Vendor ID part
-	 */
-	TNC_VendorIDList supported_vids;
-
-	/**
-	 * List of message types supported by IMC - Subtype part
-	 */
-	TNC_MessageSubtypeList supported_subtypes;
-
-	/**
-	 * Number of supported message types
-	 */
-	TNC_UInt32 type_count;
-
-	/**
-	 * mutex to lock the imc_t object
-	 */
-	mutex_t *mutex;
-};
-
-METHOD(imc_t, set_id, void,
-	private_tnc_imc_t *this, TNC_IMCID id)
-{
-	this->id = id;
-}
-
-METHOD(imc_t, get_id, TNC_IMCID,
-	private_tnc_imc_t *this)
-{
-	return this->id;
-}
-
-METHOD(imc_t, add_id, void,
-	private_tnc_imc_t *this, TNC_IMCID id)
-{
-	void *pointer;
-
-	/* store the scalar value in the pointer */
-	pointer = (void*)id;
-	this->additional_ids->insert_last(this->additional_ids, pointer);
-}
-
-METHOD(imc_t, has_id, bool,
-	private_tnc_imc_t *this, TNC_IMCID id)
-{
-	enumerator_t *enumerator;
-	TNC_IMCID additional_id;
-	void *pointer;
-	bool found = FALSE;
-
-	/* check primary IMC ID */
-	if (id == this->id)
-	{
-		return TRUE;
-	}
-
-	/* return if there are no additional IMC IDs */
-	if (this->additional_ids->get_count(this->additional_ids) == 0)
-	{
-		return FALSE;
-	}
-
-	/* check additional IMC IDs */
-	enumerator = this->additional_ids->create_enumerator(this->additional_ids);
-	while (enumerator->enumerate(enumerator, &pointer))
-	{
-		/* interpret pointer as scalar value */
-		additional_id = (TNC_UInt32)pointer;
-
-		if (id == additional_id)
-		{
-			found = TRUE;
-			break;
-		}
-	}
-	enumerator->destroy(enumerator);
-
-	return found;
-}
-
-METHOD(imc_t, get_name, char*,
-	private_tnc_imc_t *this)
-{
-	return this->name;
-}
-
-METHOD(imc_t, set_message_types, void,
-	private_tnc_imc_t *this, TNC_MessageTypeList supported_types,
-							 TNC_UInt32 type_count)
-{
-	char buf[BUF_LEN];
-	char *pos = buf;
-	int len = sizeof(buf);
-	int i, written;
-	size_t size;
-	TNC_VendorID vid;
-	TNC_MessageSubtype subtype;
-	enum_name_t *pa_subtype_names;
-
-	/* lock the imc_t instance */
-	this->mutex->lock(this->mutex);
-
-	/* Free existing VendorID and MessageSubtype lists */
-	free(this->supported_vids);
-	this->supported_vids = NULL;
-	free(this->supported_subtypes);
-	this->supported_subtypes = NULL;
-
-	/* Store the new MessageType list */
-	this->type_count = type_count;
-	if (type_count && supported_types)
-	{
-		size = type_count * sizeof(TNC_VendorID);
-		this->supported_vids = malloc(size);
-		size = type_count * sizeof(TNC_MessageSubtype);
-		this->supported_subtypes = malloc(size);
-
-		for (i = 0; i < type_count; i++)
-		{
-			vid = (supported_types[i] >> 8) & TNC_VENDORID_ANY;
-			subtype = supported_types[i] & TNC_SUBTYPE_ANY;
-
-			pa_subtype_names = get_pa_subtype_names(vid);
-			if (pa_subtype_names)
-			{
-				written = snprintf(pos, len," '%N/%N' 0x%06x/0x%02x",
-								   pen_names, vid, pa_subtype_names, subtype,
-								   vid, subtype);
-			}
-			else
-			{
-				written = snprintf(pos, len," '%N' 0x%06x/0x%02x",
-								   pen_names, vid, vid, subtype);
-			}
-			if (written >= len)
-			{
-				break;
-			}
-			pos += written;
-			len -= written;
-
-			this->supported_vids[i] = vid;
-			this->supported_subtypes[i] = subtype;
-		}
-	}
-	*pos = '\0';
-	DBG2(DBG_TNC, "IMC %u supports %u message type%s:%s",
-				  this->id, type_count, (type_count == 1) ? "":"s", buf);
-
-	/* unlock the imc_t instance */
-	this->mutex->unlock(this->mutex);
-}
-
-METHOD(imc_t, set_message_types_long, void,
-	private_tnc_imc_t *this, TNC_VendorIDList supported_vids,
-	TNC_MessageSubtypeList supported_subtypes, TNC_UInt32 type_count)
-{
-	char buf[BUF_LEN];
-	char *pos = buf;
-	int len = sizeof(buf);
-	int i, written;
-	size_t size;
-	TNC_VendorID vid;
-	TNC_MessageSubtype subtype;
-	enum_name_t *pa_subtype_names;
-
-	/* lock the imc_t instance */
-	this->mutex->lock(this->mutex);
-
-	/* Free existing VendorID and MessageSubtype lists */
-	free(this->supported_vids);
-	this->supported_vids = NULL;
-	free(this->supported_subtypes);
-	this->supported_subtypes = NULL;
-
-	/* Store the new MessageType list */
-	this->type_count = type_count;
-	if (type_count && supported_vids && supported_subtypes)
-	{
-		size = type_count * sizeof(TNC_VendorID);
-		this->supported_vids = malloc(size);
-		memcpy(this->supported_vids, supported_vids, size);
-		size = type_count * sizeof(TNC_MessageSubtype);
-		this->supported_subtypes = malloc(size);
-		memcpy(this->supported_subtypes, supported_subtypes, size);
-
-		for (i = 0; i < type_count; i++)
-		{
-			vid = supported_vids[i];
-			subtype = supported_subtypes[i];
-
-			pa_subtype_names = get_pa_subtype_names(vid);
-			if (pa_subtype_names)
-			{
-				written = snprintf(pos, len," '%N/%N' 0x%06x/0x%08x",
-								   pen_names, vid, pa_subtype_names, subtype,
-								   vid, subtype);
-			}
-			else
-			{
-				written = snprintf(pos, len," '%N' 0x%06x/0x%08x",
-								   pen_names, vid, vid, subtype);
-			}
-			if (written >= len)
-			{
-				break;
-			}
-			pos += written;
-			len -= written;
-		}
-	}
-	*pos = '\0';
-	DBG2(DBG_TNC, "IMC %u supports %u message type%s:%s",
-				  this->id, type_count, (type_count == 1) ? "":"s", buf);
-
-	/* unlock the imc_t instance */
-	this->mutex->unlock(this->mutex);
-}
-
-METHOD(imc_t, type_supported, bool,
-	private_tnc_imc_t *this, TNC_VendorID msg_vid, TNC_MessageSubtype msg_subtype)
-{
-	TNC_VendorID vid;
-	TNC_MessageSubtype subtype;
-	int i;
-
-	for (i = 0; i < this->type_count; i++)
-	{
-		vid = this->supported_vids[i];
-		subtype = this->supported_subtypes[i];
-
-		if ((vid == TNC_VENDORID_ANY && subtype == TNC_SUBTYPE_ANY) ||
-			(vid == msg_vid && (subtype == TNC_SUBTYPE_ANY ||
-			 subtype == msg_subtype)))
-		{
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-METHOD(imc_t, destroy, void,
-	private_tnc_imc_t *this)
-{
-	if (this->handle && lib->settings->get_bool(lib->settings,
-		"%s.plugins.tnc-imc.dlclose", TRUE, charon->name))
-	{
-		dlclose(this->handle);
-	}
-	this->mutex->destroy(this->mutex);
-	this->additional_ids->destroy(this->additional_ids);
-	free(this->supported_vids);
-	free(this->supported_subtypes);
-	free(this->name);
-	free(this);
-}
-
-/**
- * Generic constructor
- */
-static private_tnc_imc_t* tnc_imc_create_empty(char *name)
-{
-	private_tnc_imc_t *this;
-
-	INIT(this,
-		.public = {
-			.set_id = _set_id,
-			.get_id = _get_id,
-			.add_id = _add_id,
-			.has_id = _has_id,
-			.get_name = _get_name,
-			.set_message_types = _set_message_types,
-			.set_message_types_long = _set_message_types_long,
-			.type_supported = _type_supported,
-			.destroy = _destroy,
-		},
-		.name = strdup(name),
-		.additional_ids = linked_list_create(),
-		.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
-	);
-
-	return this;
-}
-
-/**
- * See header
- */
-imc_t* tnc_imc_create(char *name, char *path)
-{
-	private_tnc_imc_t *this;
-
-	this = tnc_imc_create_empty(name);
-
-	this->handle = dlopen(path, RTLD_LAZY);
-	if (!this->handle)
-	{
-		DBG1(DBG_TNC, "IMC \"%s\" failed to load: %s", name, dlerror());
-		destroy(this);
-		return NULL;
-	}
-
-	this->public.initialize = dlsym(this->handle, "TNC_IMC_Initialize");
-	if (!this->public.initialize)
-	{
-		DBG1(DBG_TNC, "could not resolve TNC_IMC_Initialize in %s: %s\n",
-					   path, dlerror());
-		destroy(this);
-		return NULL;
-	}
-	this->public.notify_connection_change =
-						 dlsym(this->handle, "TNC_IMC_NotifyConnectionChange");
-	this->public.begin_handshake = dlsym(this->handle, "TNC_IMC_BeginHandshake");
-	if (!this->public.begin_handshake)
-	{
-		DBG1(DBG_TNC, "could not resolve TNC_IMC_BeginHandshake in %s: %s\n",
-					   path, dlerror());
-		destroy(this);
-		return NULL;
-	}
-	this->public.receive_message =
-						dlsym(this->handle, "TNC_IMC_ReceiveMessage");
-	this->public.receive_message_long =
-						dlsym(this->handle, "TNC_IMC_ReceiveMessageLong");
-	this->public.batch_ending =
-						dlsym(this->handle, "TNC_IMC_BatchEnding");
-	this->public.terminate =
-						dlsym(this->handle, "TNC_IMC_Terminate");
-	this->public.provide_bind_function =
-						dlsym(this->handle, "TNC_IMC_ProvideBindFunction");
-	if (!this->public.provide_bind_function)
-	{
-		DBG1(DBG_TNC, "could not resolve TNC_IMC_ProvideBindFunction in %s: %s\n",
-					  path, dlerror());
-		destroy(this);
-		return NULL;
-	}
-
-	return &this->public;
-}
-
-/**
- * See header
- */
-imc_t* tnc_imc_create_from_functions(char *name,
-				TNC_IMC_InitializePointer initialize,
-				TNC_IMC_NotifyConnectionChangePointer notify_connection_change,
-				TNC_IMC_BeginHandshakePointer begin_handshake,
-				TNC_IMC_ReceiveMessagePointer receive_message,
-				TNC_IMC_ReceiveMessageLongPointer receive_message_long,
-				TNC_IMC_BatchEndingPointer batch_ending,
-				TNC_IMC_TerminatePointer terminate,
-				TNC_IMC_ProvideBindFunctionPointer provide_bind_function)
-{
-	private_tnc_imc_t *this;
-
-	this = tnc_imc_create_empty(name);
-
-	this->public.initialize = initialize;
-	this->public.notify_connection_change = notify_connection_change;
-	this->public.begin_handshake = begin_handshake;
-	this->public.receive_message = receive_message;
-	this->public.receive_message_long = receive_message_long;
-	this->public.batch_ending = batch_ending;
-	this->public.terminate = terminate;
-	this->public.provide_bind_function = provide_bind_function;
-
-	return &this->public;
-}
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.h b/src/libcharon/plugins/tnc_imc/tnc_imc.h
deleted file mode 100644
index 2d4607e77..000000000
--- a/src/libcharon/plugins/tnc_imc/tnc_imc.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2010 Andreas Steffen
- * HSR 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 tnc_imc_t tnc_imc
- * @{ @ingroup tnc_imc
- */
-
-#ifndef TNC_IMC_H_
-#define TNC_IMC_H_
-
-#include <tnc/imc/imc.h>
-
-/**
- * Create an Integrity Measurement Collector loaded from a library.
- *
- * @param name			name of the IMC
- * @param filename		path to the dynamic IMC library
- * @return				instance of the imc_t interface
- */
-imc_t* tnc_imc_create(char *name, char *filename);
-
-/**
- * Create an Integrity Measurement Collector from a set of IMC functions.
- *
- * @param name						name of the IMC
- * @param initialize				TNC_IMC_InitializePointer
- * @param notify_connection_change	TNC_IMC_NotifyConnectionChangePointer
- * @param begin_handshake			TNC_IMC_BeginHandshakePointer
- * @param receive_message			TNC_IMC_ReceiveMessagePointer
- * @param receive_message_long		TNC_IMC_ReceiveMessageLongPointer
- * @param batch_ending				TNC_IMC_BatchEndingPointer
- * @param terminate					TNC_IMC_TerminatePointer
- * @param provide_bind_function		TNC_IMC_ProvideBindFunctionPointer
- * @return							instance of the imc_t interface
- */
-imc_t* tnc_imc_create_from_functions(char *name,
-				TNC_IMC_InitializePointer initialize,
-				TNC_IMC_NotifyConnectionChangePointer notify_connection_change,
-				TNC_IMC_BeginHandshakePointer begin_handshake,
-				TNC_IMC_ReceiveMessagePointer receive_message,
-				TNC_IMC_ReceiveMessageLongPointer receive_message_long,
-				TNC_IMC_BatchEndingPointer batch_ending,
-				TNC_IMC_TerminatePointer terminate,
-				TNC_IMC_ProvideBindFunctionPointer provide_bind_function);
-
-#endif /** TNC_IMC_H_ @}*/
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c b/src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c
deleted file mode 100644
index 26a5ed2b4..000000000
--- a/src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2006 Mike McCauley
- * Copyright (C) 2010 Andreas Steffen, HSR 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 <tnc/tnc.h>
-#include <tnc/imc/imc_manager.h>
-#include <tnc/tnccs/tnccs_manager.h>
-
-#include <utils/debug.h>
-
-/**
- * Called by the IMC to inform a TNCC about the set of message types the IMC
- * is able to receive
- */
-TNC_Result TNC_TNCC_ReportMessageTypes(TNC_IMCID imc_id,
-									   TNC_MessageTypeList supported_types,
-									   TNC_UInt32 type_count)
-{
-	if (!tnc->imcs->is_registered(tnc->imcs, imc_id))
-	{
-		DBG1(DBG_TNC, "ignoring ReportMessageTypes() from unregistered IMC %u",
-					   imc_id);
-		return TNC_RESULT_INVALID_PARAMETER;
-	}
-	return tnc->imcs->set_message_types(tnc->imcs, imc_id, supported_types,
-										type_count);
-}
-
-/**
- * Called by the IMC to inform a TNCC about the set of message types the IMC
- * is able to receive. This function supports long message types.
- */
-TNC_Result TNC_TNCC_ReportMessageTypesLong(TNC_IMCID imc_id,
-									   TNC_VendorIDList supported_vids,
-									   TNC_MessageSubtypeList supported_subtypes,
-									   TNC_UInt32 type_count)
-{
-	if (!tnc->imcs->is_registered(tnc->imcs, imc_id))
-	{
-		DBG1(DBG_TNC, "ignoring ReportMessageTypesLong() from unregistered IMC %u",
-					   imc_id);
-		return TNC_RESULT_INVALID_PARAMETER;
-	}
-	return tnc->imcs->set_message_types_long(tnc->imcs, imc_id, supported_vids,
-											 supported_subtypes, type_count);
-}
-
-/**
- * Called by the IMC to ask a TNCC to retry an Integrity Check Handshake
- */
-TNC_Result TNC_TNCC_RequestHandshakeRetry(TNC_IMCID imc_id,
-										  TNC_ConnectionID connection_id,
-										  TNC_RetryReason reason)
-{
-	if (!tnc->imcs->is_registered(tnc->imcs, imc_id))
-	{
-		DBG1(DBG_TNC, "ignoring RequestHandshakeRetry() from unregistered IMC %u",
-					   imc_id);
-		return TNC_RESULT_INVALID_PARAMETER;
-	}
-	return tnc->tnccs->request_handshake_retry(tnc->tnccs, TRUE, imc_id,
-											   connection_id, reason);
-}
-
-/**
- * Called by the IMC when an IMC-IMV message is to be sent
- */
-TNC_Result TNC_TNCC_SendMessage(TNC_IMCID imc_id,
-								TNC_ConnectionID connection_id,
-								TNC_BufferReference msg,
-								TNC_UInt32 msg_len,
-								TNC_MessageType msg_type)
-{
-	TNC_VendorID msg_vid;
-	TNC_MessageSubtype msg_subtype;
-
-	if (!tnc->imcs->is_registered(tnc->imcs, imc_id))
-	{
-		DBG1(DBG_TNC, "ignoring SendMessage() from unregistered IMC %u",
-					   imc_id);
-		return TNC_RESULT_INVALID_PARAMETER;
-	}
-	msg_vid = (msg_type >> 8) & TNC_VENDORID_ANY;
-	msg_subtype = msg_type & TNC_SUBTYPE_ANY;
-
-	return tnc->tnccs->send_message(tnc->tnccs, imc_id, TNC_IMVID_ANY,
-						connection_id, 0, msg, msg_len, msg_vid, msg_subtype);
-}
-
-/**
- * Called by the IMC when an IMC-IMV message is to be sent over IF-TNCCS 2.0
- */
-TNC_Result TNC_TNCC_SendMessageLong(TNC_IMCID imc_id,
-									TNC_ConnectionID connection_id,
-									TNC_UInt32 msg_flags,
-									TNC_BufferReference msg,
-									TNC_UInt32 msg_len,
-									TNC_VendorID msg_vid,
-									TNC_MessageSubtype msg_subtype,
-	 						 		TNC_UInt32 imv_id)
-{
-	if (!tnc->imcs->is_registered(tnc->imcs, imc_id))
-	{
-		DBG1(DBG_TNC, "ignoring SendMessage() from unregistered IMC %u",
-					   imc_id);
-		return TNC_RESULT_INVALID_PARAMETER;
-	}
-	return tnc->tnccs->send_message(tnc->tnccs, imc_id, imv_id, connection_id,
-								msg_flags, msg, msg_len, msg_vid, msg_subtype);
-}
-
-/**
- * Called by the IMC to get the value of an attribute associated with a
- * connection or with the TNCC as a whole.
- */
-TNC_Result TNC_TNCC_GetAttribute(TNC_IMCID imc_id,
-								 TNC_ConnectionID connection_id,
-								 TNC_AttributeID attribute_id,
-								 TNC_UInt32 buffer_len,
-								 TNC_BufferReference buffer,
-								 TNC_UInt32 *out_value_len)
-{
-	if (!tnc->imcs->is_registered(tnc->imcs, imc_id))
-	{
-		DBG1(DBG_TNC, "ignoring GetAttribute() from unregistered IMC %u",
-					   imc_id);
-		return TNC_RESULT_INVALID_PARAMETER;
-	}
-	return tnc->tnccs->get_attribute(tnc->tnccs, TRUE, imc_id, connection_id,
-							attribute_id, buffer_len, buffer, out_value_len);
-}
-
-/**
- * Called by the IMC to set the value of an attribute associated with a
- * connection or with the TNCC as a whole.
- */
-TNC_Result TNC_TNCC_SetAttribute(TNC_IMCID imc_id,
-								 TNC_ConnectionID connection_id,
-								 TNC_AttributeID attribute_id,
-								 TNC_UInt32 buffer_len,
-								 TNC_BufferReference buffer)
-{
-	if (!tnc->imcs->is_registered(tnc->imcs, imc_id))
-	{
-		DBG1(DBG_TNC, "ignoring SetAttribute() from unregistered IMC %u",
-					   imc_id);
-		return TNC_RESULT_INVALID_PARAMETER;
-	}
-	return tnc->tnccs->set_attribute(tnc->tnccs, TRUE, imc_id, connection_id,
-									 attribute_id, buffer_len, buffer);
-}
-
-/**
- * Called by the IMC when it wants to reserve an additional IMC ID for itself
- */
-TNC_Result TNC_TNCC_ReserveAdditionalIMCID(TNC_IMCID imc_id, TNC_UInt32 *new_id)
-{
-	if (tnc->imcs->reserve_id(tnc->imcs, imc_id, new_id))
-	{
-		return TNC_RESULT_SUCCESS;
-	}
-	DBG1(DBG_TNC, "ignoring ReserveAdditionalIMCID() from unregistered IMC %u",
-				   imc_id);
-	return TNC_RESULT_INVALID_PARAMETER;
-}
-
-/**
- * Called by the IMC when it needs a function pointer
- */
-TNC_Result TNC_TNCC_BindFunction(TNC_IMCID id,
-								 char *function_name,
-								 void **function_pointer)
-{
-	if (streq(function_name, "TNC_TNCC_ReportMessageTypes"))
-	{
-		*function_pointer = (void*)TNC_TNCC_ReportMessageTypes;
-	}
-	else if (streq(function_name, "TNC_TNCC_ReportMessageTypesLong"))
-	{
-		*function_pointer = (void*)TNC_TNCC_ReportMessageTypesLong;
-	}
-    else if (streq(function_name, "TNC_TNCC_RequestHandshakeRetry"))
-	{
-		*function_pointer = (void*)TNC_TNCC_RequestHandshakeRetry;
-	}
-    else if (streq(function_name, "TNC_TNCC_SendMessage"))
-	{
-		*function_pointer = (void*)TNC_TNCC_SendMessage;
-	}
-    else if (streq(function_name, "TNC_TNCC_SendMessageLong"))
-	{
-		*function_pointer = (void*)TNC_TNCC_SendMessageLong;
-	}
-	else if (streq(function_name, "TNC_TNCC_GetAttribute"))
-	{
-		*function_pointer = (void*)TNC_TNCC_GetAttribute;
-	}
-	else if (streq(function_name, "TNC_TNCC_SetAttribute"))
-	{
-		*function_pointer = (void*)TNC_TNCC_SetAttribute;
-	}
-    else if (streq(function_name, "TNC_TNCC_ReserveAdditionalIMCID"))
-	{
-		*function_pointer = (void*)TNC_TNCC_ReserveAdditionalIMCID;
-	}
-    else
-	{
-		return TNC_RESULT_INVALID_PARAMETER;
-	}
-    return TNC_RESULT_SUCCESS;
-}
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c b/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
deleted file mode 100644
index 078f7bc34..000000000
--- a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * Copyright (C) 2006 Mike McCauley
- * Copyright (C) 2010-2011 Andreas Steffen
- * HSR 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 "tnc_imc_manager.h"
-#include "tnc_imc.h"
-
-#include <tncifimc.h>
-
-#include <daemon.h>
-#include <utils/debug.h>
-#include <threading/rwlock.h>
-#include <threading/mutex.h>
-#include <collections/linked_list.h>
-
-typedef struct private_tnc_imc_manager_t private_tnc_imc_manager_t;
-
-/**
- * Private data of an imc_manager_t object.
- */
-struct private_tnc_imc_manager_t {
-
-	/**
-	 * Public members of imc_manager_t.
-	 */
-	imc_manager_t public;
-
-	/**
-	 * Linked list of IMCs
-	 */
-	linked_list_t *imcs;
-
-	/**
-	 * Lock to access IMC list
-	 */
-	rwlock_t *lock;
-
-	/**
-	 * Next IMC ID to be assigned
-	 */
-	TNC_IMCID next_imc_id;
-
-	/**
-	 * Mutex to access next IMC ID
-	 */
-	mutex_t *id_mutex;
-};
-
-METHOD(imc_manager_t, add, bool,
-	private_tnc_imc_manager_t *this, imc_t *imc)
-{
-	TNC_Version version;
-	TNC_IMCID imc_id;
-
-	this->id_mutex->lock(this->id_mutex);
-	imc_id = this->next_imc_id++;
-	this->id_mutex->unlock(this->id_mutex);
-
-	imc->set_id(imc, imc_id);
-	if (imc->initialize(imc_id, TNC_IFIMC_VERSION_1,
-						TNC_IFIMC_VERSION_1, &version) != TNC_RESULT_SUCCESS)
-	{
-		DBG1(DBG_TNC, "IMC \"%s\" failed to initialize", imc->get_name(imc));
-		return FALSE;
-	}
-	this->lock->write_lock(this->lock);
-	this->imcs->insert_last(this->imcs, imc);
-	this->lock->unlock(this->lock);
-
-	if (imc->provide_bind_function(imc->get_id(imc),
-								   TNC_TNCC_BindFunction) != TNC_RESULT_SUCCESS)
-	{
-		if (imc->terminate)
-		{
-			imc->terminate(imc->get_id(imc));
-		}
-		DBG1(DBG_TNC, "IMC \"%s\" failed to obtain bind function",
-			 imc->get_name(imc));
-		this->lock->write_lock(this->lock);
-		this->imcs->remove_last(this->imcs, (void**)&imc);
-		this->lock->unlock(this->lock);
-		return FALSE;
-	}
-	return TRUE;
-}
-
-METHOD(imc_manager_t, remove_, imc_t*,
-	private_tnc_imc_manager_t *this, TNC_IMCID id)
-{
-	enumerator_t *enumerator;
-	imc_t *imc, *removed_imc = NULL;
-
-	this->lock->write_lock(this->lock);
-	enumerator = this->imcs->create_enumerator(this->imcs);
-	while (enumerator->enumerate(enumerator, &imc))
-	{
-		if (id == imc->get_id(imc))
-		{
-			this->imcs->remove_at(this->imcs, enumerator);
-			removed_imc = imc;
-			break;
-		}
-	}
-	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
-
-	return removed_imc;
-}
-
-METHOD(imc_manager_t, load, bool,
-	private_tnc_imc_manager_t *this, char *name, char *path)
-{
-	imc_t *imc;
-
-	imc = tnc_imc_create(name, path);
-	if (!imc)
-	{
-		return FALSE;
-	}
-	if (!add(this, imc))
-	{
-		imc->destroy(imc);
-		return FALSE;
-	}
-	DBG1(DBG_TNC, "IMC %u \"%s\" loaded from '%s'", imc->get_id(imc), name, path);
-	return TRUE;
-}
-
-METHOD(imc_manager_t, load_from_functions, bool,
-	private_tnc_imc_manager_t *this, char *name,
-	TNC_IMC_InitializePointer initialize,
-	TNC_IMC_NotifyConnectionChangePointer notify_connection_change,
-	TNC_IMC_BeginHandshakePointer begin_handshake,
-	TNC_IMC_ReceiveMessagePointer receive_message,
-	TNC_IMC_ReceiveMessageLongPointer receive_message_long,
-	TNC_IMC_BatchEndingPointer batch_ending,
-	TNC_IMC_TerminatePointer terminate,
-	TNC_IMC_ProvideBindFunctionPointer provide_bind_function)
-{
-	imc_t *imc;
-
-	imc = tnc_imc_create_from_functions(name,
-										initialize, notify_connection_change,
-										begin_handshake, receive_message,
-										receive_message_long, batch_ending,
-										terminate, provide_bind_function);
-	if (!imc)
-	{
-		return FALSE;
-	}
-	if (!add(this, imc))
-	{
-		imc->destroy(imc);
-		return FALSE;
-	}
-	DBG1(DBG_TNC, "IMC %u \"%s\" loaded", imc->get_id(imc), name);
-	return TRUE;
-}
-
-METHOD(imc_manager_t, is_registered, bool,
-	private_tnc_imc_manager_t *this, TNC_IMCID id)
-{
-	enumerator_t *enumerator;
-	imc_t *imc;
-	bool found = FALSE;
-
-	this->lock->read_lock(this->lock);
-	enumerator = this->imcs->create_enumerator(this->imcs);
-	while (enumerator->enumerate(enumerator, &imc))
-	{
-		if (imc->has_id(imc, id))
-		{
-			found = TRUE;
-			break;
-		}
-	}
-	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
-
-	return found;
-}
-
-METHOD(imc_manager_t, reserve_id, bool,
-	private_tnc_imc_manager_t *this, TNC_IMCID id, TNC_UInt32 *new_id)
-{
-	enumerator_t *enumerator;
-	imc_t *imc;
-	bool found = FALSE;
-
-	this->lock->read_lock(this->lock);
-	enumerator = this->imcs->create_enumerator(this->imcs);
-	while (enumerator->enumerate(enumerator, &imc))
-	{
-		if (id == imc->get_id(imc))
-		{
-			found = TRUE;
-			this->id_mutex->lock(this->id_mutex);
-			*new_id = this->next_imc_id++;
-			this->id_mutex->unlock(this->id_mutex);
-			imc->add_id(imc, *new_id);
-			DBG2(DBG_TNC, "additional ID %u reserved for IMC with primary ID %u",
-						  *new_id, id);
-			break;
-		}
-	}
-	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
-
-	return found;
-}
-
-METHOD(imc_manager_t, get_preferred_language, char*,
-	private_tnc_imc_manager_t *this)
-{
-	return lib->settings->get_str(lib->settings,
-				"%s.plugins.tnc-imc.preferred_language", "en", charon->name);
-}
-
-METHOD(imc_manager_t, notify_connection_change, void,
-	private_tnc_imc_manager_t *this, TNC_ConnectionID id,
-									 TNC_ConnectionState state)
-{
-	enumerator_t *enumerator;
-	imc_t *imc;
-
-	this->lock->read_lock(this->lock);
-	enumerator = this->imcs->create_enumerator(this->imcs);
-	while (enumerator->enumerate(enumerator, &imc))
-	{
-		if (imc->notify_connection_change)
-		{
-			imc->notify_connection_change(imc->get_id(imc), id, state);
-		}
-	}
-	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
-}
-
-METHOD(imc_manager_t, begin_handshake, void,
-	private_tnc_imc_manager_t *this, TNC_ConnectionID id)
-{
-	enumerator_t *enumerator;
-	imc_t *imc;
-
-	this->lock->read_lock(this->lock);
-	enumerator = this->imcs->create_enumerator(this->imcs);
-	while (enumerator->enumerate(enumerator, &imc))
-	{
-		imc->begin_handshake(imc->get_id(imc), id);
-	}
-	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
-}
-
-METHOD(imc_manager_t, set_message_types, TNC_Result,
-	private_tnc_imc_manager_t *this, TNC_IMCID id,
-									 TNC_MessageTypeList supported_types,
-									 TNC_UInt32 type_count)
-{
-	enumerator_t *enumerator;
-	imc_t *imc;
-	TNC_Result result = TNC_RESULT_FATAL;
-
-	this->lock->read_lock(this->lock);
-	enumerator = this->imcs->create_enumerator(this->imcs);
-	while (enumerator->enumerate(enumerator, &imc))
-	{
-		if (id == imc->get_id(imc))
-		{
-			imc->set_message_types(imc, supported_types, type_count);
-			result = TNC_RESULT_SUCCESS;
-			break;
-		}
-	}
-	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
-	return result;
-}
-
-METHOD(imc_manager_t, set_message_types_long, TNC_Result,
-	private_tnc_imc_manager_t *this, TNC_IMCID id,
-									 TNC_VendorIDList supported_vids,
-									 TNC_MessageSubtypeList supported_subtypes,
-									 TNC_UInt32 type_count)
-{
-	enumerator_t *enumerator;
-	imc_t *imc;
-	TNC_Result result = TNC_RESULT_FATAL;
-
-	this->lock->read_lock(this->lock);
-	enumerator = this->imcs->create_enumerator(this->imcs);
-	while (enumerator->enumerate(enumerator, &imc))
-	{
-		if (id == imc->get_id(imc))
-		{
-			imc->set_message_types_long(imc, supported_vids, supported_subtypes,
-										type_count);
-			result = TNC_RESULT_SUCCESS;
-			break;
-		}
-	}
-	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
-	return result;
-}
-
-METHOD(imc_manager_t, receive_message, void,
-	private_tnc_imc_manager_t *this, TNC_ConnectionID connection_id,
-									 bool excl,
-									 TNC_BufferReference msg,
-									 TNC_UInt32 msg_len,
-									 TNC_VendorID msg_vid,
-									 TNC_MessageSubtype msg_subtype,
-									 TNC_UInt32 src_imv_id,
-									 TNC_UInt32 dst_imc_id)
-{
-	bool type_supported = FALSE;
-	TNC_MessageType	msg_type;
-	TNC_UInt32 msg_flags;
-	enumerator_t *enumerator;
-	imc_t *imc;
-
-	this->lock->read_lock(this->lock);
-	enumerator = this->imcs->create_enumerator(this->imcs);
-	while (enumerator->enumerate(enumerator, &imc))
-	{
-		if (imc->type_supported(imc, msg_vid, msg_subtype) &&
-			(!excl || (excl && imc->has_id(imc, dst_imc_id))))
-		{
-			if (imc->receive_message_long && src_imv_id)
-			{
-				type_supported = TRUE;
-				msg_flags = excl ? TNC_MESSAGE_FLAGS_EXCLUSIVE : 0;
-				imc->receive_message_long(imc->get_id(imc), connection_id,
-								msg_flags, msg, msg_len, msg_vid, msg_subtype,
-								src_imv_id, dst_imc_id);
-
-			}
-			else if (imc->receive_message && msg_vid <= TNC_VENDORID_ANY &&
-					 msg_subtype <= TNC_SUBTYPE_ANY)
-			{
-				type_supported = TRUE;
-				msg_type = (msg_vid << 8) | msg_subtype;
-				imc->receive_message(imc->get_id(imc), connection_id,
-									 msg, msg_len, msg_type);
-			}
-		}
-	}
-	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
-
-	if (!type_supported)
-	{
-		DBG2(DBG_TNC, "message type 0x%06x/0x%08x not supported by any IMC",
-			 msg_vid, msg_subtype);
-	}
-}
-
-METHOD(imc_manager_t, batch_ending, void,
-	private_tnc_imc_manager_t *this, TNC_ConnectionID id)
-{
-	enumerator_t *enumerator;
-	imc_t *imc;
-
-	this->lock->read_lock(this->lock);
-	enumerator = this->imcs->create_enumerator(this->imcs);
-	while (enumerator->enumerate(enumerator, &imc))
-	{
-		if (imc->batch_ending)
-		{
-			imc->batch_ending(imc->get_id(imc), id);
-		}
-	}
-	enumerator->destroy(enumerator);
-	this->lock->unlock(this->lock);
-}
-
-METHOD(imc_manager_t, destroy, void,
-	private_tnc_imc_manager_t *this)
-{
-	imc_t *imc;
-
-	while (this->imcs->remove_last(this->imcs, (void**)&imc) == SUCCESS)
-	{
-		if (imc->terminate &&
-			imc->terminate(imc->get_id(imc)) != TNC_RESULT_SUCCESS)
-		{
-			DBG1(DBG_TNC, "IMC \"%s\" not terminated successfully",
-						   imc->get_name(imc));
-		}
-		imc->destroy(imc);
-	}
-	this->imcs->destroy(this->imcs);
-	this->lock->destroy(this->lock);
-	this->id_mutex->destroy(this->id_mutex);
-	free(this);
-}
-
-/**
- * Described in header.
- */
-imc_manager_t* tnc_imc_manager_create(void)
-{
-	private_tnc_imc_manager_t *this;
-
-	INIT(this,
-		.public = {
-			.add = _add,
-			.remove = _remove_, /* avoid name conflict with stdio.h */
-			.load = _load,
-			.load_from_functions = _load_from_functions,
-			.is_registered = _is_registered,
-			.reserve_id = _reserve_id,
-			.get_preferred_language = _get_preferred_language,
-			.notify_connection_change = _notify_connection_change,
-			.begin_handshake = _begin_handshake,
-			.set_message_types = _set_message_types,
-			.set_message_types_long = _set_message_types_long,
-			.receive_message = _receive_message,
-			.batch_ending = _batch_ending,
-			.destroy = _destroy,
-		},
-		.imcs = linked_list_create(),
-		.lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
-		.id_mutex = mutex_create(MUTEX_TYPE_DEFAULT),
-		.next_imc_id = 1,
-	);
-
-	return &this->public;
-}
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.h b/src/libcharon/plugins/tnc_imc/tnc_imc_manager.h
deleted file mode 100644
index ed490293b..000000000
--- a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2010 Andreas Steffen
- * HSR 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 tnc_imc_manager tnc_imc_manager
- * @{ @ingroup tnc_imc
- */
-
-#ifndef TNC_IMC_MANAGER_H_
-#define TNC_IMC_MANAGER_H_
-
-#include <tnc/imc/imc_manager.h>
-
-/**
- * Create an IMC manager instance.
- */
-imc_manager_t *tnc_imc_manager_create();
-
-#endif /** TNC_IMC_MANAGER_H_ @}*/
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c b/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c
deleted file mode 100644
index 859dded79..000000000
--- a/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2010-2011 Andreas Steffen
- * HSR 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 "tnc_imc_plugin.h"
-#include "tnc_imc_manager.h"
-
-#include <tnc/tnc.h>
-
-typedef struct private_tnc_imc_plugin_t private_tnc_imc_plugin_t;
-
-/**
- * Private data of a tnc_imc_plugin_t object.
- */
-struct private_tnc_imc_plugin_t {
-
-	/**
-	 * Public interface.
-	 */
-	tnc_imc_plugin_t public;
-};
-
-METHOD(plugin_t, get_name, char*,
-	private_tnc_imc_plugin_t *this)
-{
-	return "tnc-imc";
-}
-
-METHOD(plugin_t, get_features, int,
-	private_tnc_imc_plugin_t *this, plugin_feature_t *features[])
-{
-	static plugin_feature_t f[] = {
-		PLUGIN_CALLBACK(tnc_manager_register, tnc_imc_manager_create),
-			PLUGIN_PROVIDE(CUSTOM, "imc-manager"),
-				PLUGIN_DEPENDS(CUSTOM, "tnccs-manager"),
-				PLUGIN_SDEPEND(CERT_DECODE, CERT_X509),
-				PLUGIN_SDEPEND(CERT_DECODE, CERT_TRUSTED_PUBKEY),
-	};
-	*features = f;
-	return countof(f);
-}
-
-METHOD(plugin_t, destroy, void,
-	private_tnc_imc_plugin_t *this)
-{
-	free(this);
-}
-
-/*
- * see header file
- */
-plugin_t *tnc_imc_plugin_create(void)
-{
-	private_tnc_imc_plugin_t *this;
-
-	INIT(this,
-		.public = {
-			.plugin = {
-				.get_name = _get_name,
-				.get_features = _get_features,
-				.destroy = _destroy,
-			},
-		},
-	);
-
-	return &this->public.plugin;
-}
-
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.h b/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.h
deleted file mode 100644
index 8c5521cb2..000000000
--- a/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Andreas Steffen
- * HSR 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 tnc_imc tnc_imc
- * @ingroup cplugins
- *
- * @defgroup tnc_imc_plugin tnc_imc_plugin
- * @{ @ingroup tnc_imc
- */
-
-#ifndef TNC_IMC_PLUGIN_H_
-#define TNC_IMC_PLUGIN_H_
-
-#include <plugins/plugin.h>
-
-typedef struct tnc_imc_plugin_t tnc_imc_plugin_t;
-
-/**
- * TNC IMC plugin
- */
-struct tnc_imc_plugin_t {
-
-	/**
-	 * implements plugin interface
-	 */
-	plugin_t plugin;
-};
-
-#endif /** TNC_IMC_PLUGIN_H_ @}*/