Imported Upstream version 5.1.1

28 files changed, 0 insertions, 5701 deletions

diff --git a/src/libcharon/plugins/tnccs_20/Makefile.am b/src/libcharon/plugins/tnccs_20/Makefile.am
deleted file mode 100644
index 7a2b6c9c2..000000000
--- a/src/libcharon/plugins/tnccs_20/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/libstrongswan \
-	-I$(top_srcdir)/src/libcharon \
-	-I$(top_srcdir)/src/libhydra \
-	-I$(top_srcdir)/src/libtls \
-	-I$(top_srcdir)/src/libtncif \
-	-I$(top_srcdir)/src/libtnccs
-
-AM_CFLAGS = \
-	-rdynamic
-
-if MONOLITHIC
-noinst_LTLIBRARIES = libstrongswan-tnccs-20.la
-else
-plugin_LTLIBRARIES = libstrongswan-tnccs-20.la
-libstrongswan_tnccs_20_la_LIBADD = \
-	$(top_builddir)/src/libtncif/libtncif.la \
-	$(top_builddir)/src/libtnccs/libtnccs.la
-endif
-
-libstrongswan_tnccs_20_la_SOURCES = \
-	tnccs_20_plugin.h tnccs_20_plugin.c tnccs_20.h tnccs_20.c \
-	batch/pb_tnc_batch.h batch/pb_tnc_batch.c \
-	messages/pb_tnc_msg.h messages/pb_tnc_msg.c \
-	messages/pb_experimental_msg.h messages/pb_experimental_msg.c \
-	messages/pb_pa_msg.h messages/pb_pa_msg.c \
-	messages/pb_assessment_result_msg.h messages/pb_assessment_result_msg.c \
-	messages/pb_access_recommendation_msg.h messages/pb_access_recommendation_msg.c \
-	messages/pb_error_msg.h messages/pb_error_msg.c \
-	messages/pb_language_preference_msg.h messages/pb_language_preference_msg.c \
-	messages/pb_reason_string_msg.h messages/pb_reason_string_msg.c \
-	messages/pb_remediation_parameters_msg.h messages/pb_remediation_parameters_msg.c \
-	state_machine/pb_tnc_state_machine.h state_machine/pb_tnc_state_machine.c
-
-libstrongswan_tnccs_20_la_LDFLAGS = -module -avoid-version
diff --git a/src/libcharon/plugins/tnccs_20/Makefile.in b/src/libcharon/plugins/tnccs_20/Makefile.in
deleted file mode 100644
index 9bf68ea53..000000000
--- a/src/libcharon/plugins/tnccs_20/Makefile.in
+++ /dev/null
@@ -1,798 +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/tnccs_20
-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_tnccs_20_la_DEPENDENCIES =  \
-@MONOLITHIC_FALSE@	$(top_builddir)/src/libtncif/libtncif.la \
-@MONOLITHIC_FALSE@	$(top_builddir)/src/libtnccs/libtnccs.la
-am_libstrongswan_tnccs_20_la_OBJECTS = tnccs_20_plugin.lo tnccs_20.lo \
-	pb_tnc_batch.lo pb_tnc_msg.lo pb_experimental_msg.lo \
-	pb_pa_msg.lo pb_assessment_result_msg.lo \
-	pb_access_recommendation_msg.lo pb_error_msg.lo \
-	pb_language_preference_msg.lo pb_reason_string_msg.lo \
-	pb_remediation_parameters_msg.lo pb_tnc_state_machine.lo
-libstrongswan_tnccs_20_la_OBJECTS =  \
-	$(am_libstrongswan_tnccs_20_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_tnccs_20_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libstrongswan_tnccs_20_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@MONOLITHIC_FALSE@am_libstrongswan_tnccs_20_la_rpath = -rpath \
-@MONOLITHIC_FALSE@	$(plugindir)
-@MONOLITHIC_TRUE@am_libstrongswan_tnccs_20_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_tnccs_20_la_SOURCES)
-DIST_SOURCES = $(libstrongswan_tnccs_20_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/libcharon \
-	-I$(top_srcdir)/src/libhydra \
-	-I$(top_srcdir)/src/libtls \
-	-I$(top_srcdir)/src/libtncif \
-	-I$(top_srcdir)/src/libtnccs
-
-AM_CFLAGS = \
-	-rdynamic
-
-@MONOLITHIC_TRUE@noinst_LTLIBRARIES = libstrongswan-tnccs-20.la
-@MONOLITHIC_FALSE@plugin_LTLIBRARIES = libstrongswan-tnccs-20.la
-@MONOLITHIC_FALSE@libstrongswan_tnccs_20_la_LIBADD = \
-@MONOLITHIC_FALSE@	$(top_builddir)/src/libtncif/libtncif.la \
-@MONOLITHIC_FALSE@	$(top_builddir)/src/libtnccs/libtnccs.la
-
-libstrongswan_tnccs_20_la_SOURCES = \
-	tnccs_20_plugin.h tnccs_20_plugin.c tnccs_20.h tnccs_20.c \
-	batch/pb_tnc_batch.h batch/pb_tnc_batch.c \
-	messages/pb_tnc_msg.h messages/pb_tnc_msg.c \
-	messages/pb_experimental_msg.h messages/pb_experimental_msg.c \
-	messages/pb_pa_msg.h messages/pb_pa_msg.c \
-	messages/pb_assessment_result_msg.h messages/pb_assessment_result_msg.c \
-	messages/pb_access_recommendation_msg.h messages/pb_access_recommendation_msg.c \
-	messages/pb_error_msg.h messages/pb_error_msg.c \
-	messages/pb_language_preference_msg.h messages/pb_language_preference_msg.c \
-	messages/pb_reason_string_msg.h messages/pb_reason_string_msg.c \
-	messages/pb_remediation_parameters_msg.h messages/pb_remediation_parameters_msg.c \
-	state_machine/pb_tnc_state_machine.h state_machine/pb_tnc_state_machine.c
-
-libstrongswan_tnccs_20_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/tnccs_20/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/libcharon/plugins/tnccs_20/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-tnccs-20.la: $(libstrongswan_tnccs_20_la_OBJECTS) $(libstrongswan_tnccs_20_la_DEPENDENCIES) $(EXTRA_libstrongswan_tnccs_20_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libstrongswan_tnccs_20_la_LINK) $(am_libstrongswan_tnccs_20_la_rpath) $(libstrongswan_tnccs_20_la_OBJECTS) $(libstrongswan_tnccs_20_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_access_recommendation_msg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_assessment_result_msg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_error_msg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_experimental_msg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_language_preference_msg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_pa_msg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_reason_string_msg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_remediation_parameters_msg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_tnc_batch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_tnc_msg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pb_tnc_state_machine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnccs_20.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tnccs_20_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 $@ $<
-
-pb_tnc_batch.lo: batch/pb_tnc_batch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_tnc_batch.lo -MD -MP -MF $(DEPDIR)/pb_tnc_batch.Tpo -c -o pb_tnc_batch.lo `test -f 'batch/pb_tnc_batch.c' || echo '$(srcdir)/'`batch/pb_tnc_batch.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_tnc_batch.Tpo $(DEPDIR)/pb_tnc_batch.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='batch/pb_tnc_batch.c' object='pb_tnc_batch.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_tnc_batch.lo `test -f 'batch/pb_tnc_batch.c' || echo '$(srcdir)/'`batch/pb_tnc_batch.c
-
-pb_tnc_msg.lo: messages/pb_tnc_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_tnc_msg.lo -MD -MP -MF $(DEPDIR)/pb_tnc_msg.Tpo -c -o pb_tnc_msg.lo `test -f 'messages/pb_tnc_msg.c' || echo '$(srcdir)/'`messages/pb_tnc_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_tnc_msg.Tpo $(DEPDIR)/pb_tnc_msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='messages/pb_tnc_msg.c' object='pb_tnc_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_tnc_msg.lo `test -f 'messages/pb_tnc_msg.c' || echo '$(srcdir)/'`messages/pb_tnc_msg.c
-
-pb_experimental_msg.lo: messages/pb_experimental_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_experimental_msg.lo -MD -MP -MF $(DEPDIR)/pb_experimental_msg.Tpo -c -o pb_experimental_msg.lo `test -f 'messages/pb_experimental_msg.c' || echo '$(srcdir)/'`messages/pb_experimental_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_experimental_msg.Tpo $(DEPDIR)/pb_experimental_msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='messages/pb_experimental_msg.c' object='pb_experimental_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_experimental_msg.lo `test -f 'messages/pb_experimental_msg.c' || echo '$(srcdir)/'`messages/pb_experimental_msg.c
-
-pb_pa_msg.lo: messages/pb_pa_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_pa_msg.lo -MD -MP -MF $(DEPDIR)/pb_pa_msg.Tpo -c -o pb_pa_msg.lo `test -f 'messages/pb_pa_msg.c' || echo '$(srcdir)/'`messages/pb_pa_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_pa_msg.Tpo $(DEPDIR)/pb_pa_msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='messages/pb_pa_msg.c' object='pb_pa_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_pa_msg.lo `test -f 'messages/pb_pa_msg.c' || echo '$(srcdir)/'`messages/pb_pa_msg.c
-
-pb_assessment_result_msg.lo: messages/pb_assessment_result_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_assessment_result_msg.lo -MD -MP -MF $(DEPDIR)/pb_assessment_result_msg.Tpo -c -o pb_assessment_result_msg.lo `test -f 'messages/pb_assessment_result_msg.c' || echo '$(srcdir)/'`messages/pb_assessment_result_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_assessment_result_msg.Tpo $(DEPDIR)/pb_assessment_result_msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='messages/pb_assessment_result_msg.c' object='pb_assessment_result_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_assessment_result_msg.lo `test -f 'messages/pb_assessment_result_msg.c' || echo '$(srcdir)/'`messages/pb_assessment_result_msg.c
-
-pb_access_recommendation_msg.lo: messages/pb_access_recommendation_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_access_recommendation_msg.lo -MD -MP -MF $(DEPDIR)/pb_access_recommendation_msg.Tpo -c -o pb_access_recommendation_msg.lo `test -f 'messages/pb_access_recommendation_msg.c' || echo '$(srcdir)/'`messages/pb_access_recommendation_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_access_recommendation_msg.Tpo $(DEPDIR)/pb_access_recommendation_msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='messages/pb_access_recommendation_msg.c' object='pb_access_recommendation_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_access_recommendation_msg.lo `test -f 'messages/pb_access_recommendation_msg.c' || echo '$(srcdir)/'`messages/pb_access_recommendation_msg.c
-
-pb_error_msg.lo: messages/pb_error_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_error_msg.lo -MD -MP -MF $(DEPDIR)/pb_error_msg.Tpo -c -o pb_error_msg.lo `test -f 'messages/pb_error_msg.c' || echo '$(srcdir)/'`messages/pb_error_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_error_msg.Tpo $(DEPDIR)/pb_error_msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='messages/pb_error_msg.c' object='pb_error_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_error_msg.lo `test -f 'messages/pb_error_msg.c' || echo '$(srcdir)/'`messages/pb_error_msg.c
-
-pb_language_preference_msg.lo: messages/pb_language_preference_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_language_preference_msg.lo -MD -MP -MF $(DEPDIR)/pb_language_preference_msg.Tpo -c -o pb_language_preference_msg.lo `test -f 'messages/pb_language_preference_msg.c' || echo '$(srcdir)/'`messages/pb_language_preference_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_language_preference_msg.Tpo $(DEPDIR)/pb_language_preference_msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='messages/pb_language_preference_msg.c' object='pb_language_preference_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_language_preference_msg.lo `test -f 'messages/pb_language_preference_msg.c' || echo '$(srcdir)/'`messages/pb_language_preference_msg.c
-
-pb_reason_string_msg.lo: messages/pb_reason_string_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_reason_string_msg.lo -MD -MP -MF $(DEPDIR)/pb_reason_string_msg.Tpo -c -o pb_reason_string_msg.lo `test -f 'messages/pb_reason_string_msg.c' || echo '$(srcdir)/'`messages/pb_reason_string_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_reason_string_msg.Tpo $(DEPDIR)/pb_reason_string_msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='messages/pb_reason_string_msg.c' object='pb_reason_string_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_reason_string_msg.lo `test -f 'messages/pb_reason_string_msg.c' || echo '$(srcdir)/'`messages/pb_reason_string_msg.c
-
-pb_remediation_parameters_msg.lo: messages/pb_remediation_parameters_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_remediation_parameters_msg.lo -MD -MP -MF $(DEPDIR)/pb_remediation_parameters_msg.Tpo -c -o pb_remediation_parameters_msg.lo `test -f 'messages/pb_remediation_parameters_msg.c' || echo '$(srcdir)/'`messages/pb_remediation_parameters_msg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_remediation_parameters_msg.Tpo $(DEPDIR)/pb_remediation_parameters_msg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='messages/pb_remediation_parameters_msg.c' object='pb_remediation_parameters_msg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_remediation_parameters_msg.lo `test -f 'messages/pb_remediation_parameters_msg.c' || echo '$(srcdir)/'`messages/pb_remediation_parameters_msg.c
-
-pb_tnc_state_machine.lo: state_machine/pb_tnc_state_machine.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb_tnc_state_machine.lo -MD -MP -MF $(DEPDIR)/pb_tnc_state_machine.Tpo -c -o pb_tnc_state_machine.lo `test -f 'state_machine/pb_tnc_state_machine.c' || echo '$(srcdir)/'`state_machine/pb_tnc_state_machine.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pb_tnc_state_machine.Tpo $(DEPDIR)/pb_tnc_state_machine.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='state_machine/pb_tnc_state_machine.c' object='pb_tnc_state_machine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb_tnc_state_machine.lo `test -f 'state_machine/pb_tnc_state_machine.c' || echo '$(srcdir)/'`state_machine/pb_tnc_state_machine.c
-
-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/tnccs_20/batch/pb_tnc_batch.c b/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
deleted file mode 100644
index d87e0ccea..000000000
--- a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyanbuu
- * Copyright (C) 2010-2012 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 "pb_tnc_batch.h"
-#include "messages/pb_error_msg.h"
-#include "state_machine/pb_tnc_state_machine.h"
-
-#include <tnc/tnccs/tnccs.h>
-
-#include <collections/linked_list.h>
-#include <bio/bio_writer.h>
-#include <bio/bio_reader.h>
-#include <pen/pen.h>
-#include <utils/debug.h>
-
-ENUM(pb_tnc_batch_type_names, PB_BATCH_CDATA, PB_BATCH_CLOSE,
-	"CDATA",
-	"SDATA",
-	"RESULT",
-	"CRETRY",
-	"SRETRY",
-	"CLOSE"
-);
-
-typedef struct private_pb_tnc_batch_t private_pb_tnc_batch_t;
-
-/**
- *   PB-Batch Header (see section 4.1 of RFC 5793)
- *
- *      0                   1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |    Version    |D|     Reserved                        | B-Type|
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                       Batch Length                            |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-#define PB_TNC_BATCH_FLAG_NONE		0x00
-#define PB_TNC_BATCH_FLAG_D			(1<<7)
-#define PB_TNC_BATCH_HEADER_SIZE	8
-
-/**
- *   PB-TNC Message (see section 4.2 of RFC 5793)
- *
- *      0                   1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |     Flags     |               PB-TNC Vendor ID                |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                       PB-TNC Message Type                     |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                      PB-TNC Message Length                    |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |               PB-TNC Message Value (Variable Length)          |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-#define PB_TNC_FLAG_NONE			0x00
-#define PB_TNC_FLAG_NOSKIP			(1<<7)
-#define PB_TNC_HEADER_SIZE			12
-
-#define PB_TNC_RESERVED_MSG_TYPE	0xffffffff
-
-/**
- * Private data of a pb_tnc_batch_t object.
- *
- */
-struct private_pb_tnc_batch_t {
-	/**
-	 * Public pb_pa_msg_t interface.
-	 */
-	pb_tnc_batch_t public;
-
-	/**
-	 * TNCC if TRUE, TNCS if FALSE
-	 */
-	bool is_server;
-
-	/**
-	 * PB-TNC Batch type
-	 */
-	pb_tnc_batch_type_t type;
-
-	/**
-	 * Current PB-TNC Batch size
-	 */
-	size_t batch_len;
-
-	/**
-	 * Maximum PB-TNC Batch size
-	 */
-	size_t max_batch_len;
-
-	/**
-	 * linked list of PB-TNC messages
-	 */
-	linked_list_t *messages;
-
-	/**
-	 * linked list of PB-TNC error messages
-	 */
-	linked_list_t *errors;
-
-	/**
-	 * Encoded message
-	 */
-	chunk_t encoding;
-
-	/**
-	 * Offset into encoding (used for error reporting)
-	 */
-	u_int32_t offset;
-};
-
-METHOD(pb_tnc_batch_t, get_type, pb_tnc_batch_type_t,
-	private_pb_tnc_batch_t *this)
-{
-	return this->type;
-}
-
-METHOD(pb_tnc_batch_t, get_encoding, chunk_t,
-	private_pb_tnc_batch_t *this)
-{
-	return this->encoding;
-}
-
-METHOD(pb_tnc_batch_t, add_msg, bool,
-	private_pb_tnc_batch_t *this, pb_tnc_msg_t* msg)
-{
-	chunk_t msg_value;
-	size_t msg_len;
-
-	msg->build(msg);
-	msg_value = msg->get_encoding(msg);
-	msg_len = PB_TNC_HEADER_SIZE + msg_value.len;
-
-	if (this->batch_len + msg_len > this->max_batch_len)
-	{
-		/* message just does not fit into this batch */
-		return FALSE;
-	}
-	this->batch_len += msg_len;
-
-	DBG2(DBG_TNC, "adding %N message", pb_tnc_msg_type_names,
-									   msg->get_type(msg));
-	this->messages->insert_last(this->messages, msg);
-	return TRUE;
-}
-
-METHOD(pb_tnc_batch_t, build, void,
-	private_pb_tnc_batch_t *this)
-{
-	u_int32_t msg_len;
-	chunk_t msg_value;
-	enumerator_t *enumerator;
-	pb_tnc_msg_type_t msg_type;
-	pb_tnc_msg_t *msg;
-	bio_writer_t *writer;
-
-	/* build PB-TNC batch header */
-	writer = bio_writer_create(this->batch_len);
-	writer->write_uint8 (writer, PB_TNC_VERSION);
-	writer->write_uint8 (writer, this->is_server ?
-								 PB_TNC_BATCH_FLAG_D : PB_TNC_BATCH_FLAG_NONE);
-	writer->write_uint16(writer, this->type);
-	writer->write_uint32(writer, this->batch_len);
-
-	/* build PB-TNC messages */
-	enumerator = this->messages->create_enumerator(this->messages);
-	while (enumerator->enumerate(enumerator, &msg))
-	{
-		u_int8_t flags = PB_TNC_FLAG_NONE;
-
-		/* build PB-TNC message */
-		msg_value = msg->get_encoding(msg);
-		msg_len = PB_TNC_HEADER_SIZE + msg_value.len;
-		msg_type = msg->get_type(msg);
-		if (pb_tnc_msg_infos[msg_type].has_noskip_flag)
-		{
-			flags |= PB_TNC_FLAG_NOSKIP;
-		}
-		writer->write_uint8 (writer, flags);
-		writer->write_uint24(writer, PEN_IETF);
-		writer->write_uint32(writer, msg_type);
-		writer->write_uint32(writer, msg_len);
-		writer->write_data  (writer, msg_value);
-	}
-	enumerator->destroy(enumerator);
-
-	this->encoding = writer->extract_buf(writer);
-	writer->destroy(writer);
-}
-
-static status_t process_batch_header(private_pb_tnc_batch_t *this,
-									 pb_tnc_state_machine_t *state_machine)
-{
-	bio_reader_t *reader;
-	pb_tnc_msg_t *msg;
-	pb_error_msg_t *err_msg;
-	u_int8_t version, flags, reserved, type;
-	u_int32_t batch_len;
-	bool directionality;
-
-	if (this->encoding.len < PB_TNC_BATCH_HEADER_SIZE)
-	{
-		DBG1(DBG_TNC, "%u bytes insufficient to parse PB-TNC batch header",
-					   this->encoding.len);
-		msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, 0);
-		goto fatal;
-	}
-
-	reader = bio_reader_create(this->encoding);
-	reader->read_uint8 (reader, &version);
-	reader->read_uint8 (reader, &flags);
-	reader->read_uint8 (reader, &reserved);
-	reader->read_uint8 (reader, &type);
-	reader->read_uint32(reader, &batch_len);
-	reader->destroy(reader);
-
-	/* Version */
-	if (version != PB_TNC_VERSION)
-	{
-		DBG1(DBG_TNC, "unsupported TNCCS batch version 0x%02x", version);
-		msg = pb_error_msg_create(TRUE, PEN_IETF,
-								  PB_ERROR_VERSION_NOT_SUPPORTED);
-		err_msg = (pb_error_msg_t*)msg;
-		err_msg->set_bad_version(err_msg, version);
-		goto fatal;
-	}
-
-	/* Directionality */
-	directionality = (flags & PB_TNC_BATCH_FLAG_D) != PB_TNC_BATCH_FLAG_NONE;
-	if (directionality == this->is_server)
-	{
-		DBG1(DBG_TNC, "wrong Directionality: batch is from a PB %s",
-			 directionality ? "server" : "client");
-		msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, 1);
-		goto fatal;
-	}
-
-	/* Batch Type */
-	this->type = type & 0x0F;
-	if (this->type > PB_BATCH_ROOF)
-	{
-		DBG1(DBG_TNC, "unknown PB-TNC batch type: %d", this->type);
-		msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, 3);
-		goto fatal;
-	}
-
-	if (!state_machine->receive_batch(state_machine, this->type))
-	{
-		DBG1(DBG_TNC, "unexpected PB-TNC batch type: %N",
-					   pb_tnc_batch_type_names, this->type);
-		msg = pb_error_msg_create(TRUE, PEN_IETF,
-								  PB_ERROR_UNEXPECTED_BATCH_TYPE);
-		goto fatal;
-	}
-	DBG1(DBG_TNC, "processing PB-TNC %N batch", pb_tnc_batch_type_names,
-												this->type);
-
-	/* Batch Length */
-	if (this->encoding.len != batch_len)
-	{
-		DBG1(DBG_TNC, "%u bytes of data is not equal to batch length of %u bytes",
-					   this->encoding.len, batch_len);
-		msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, 4);
-		goto fatal;
-	}
-
-	this->offset = PB_TNC_BATCH_HEADER_SIZE;
-
-	/* Register an empty CDATA batch with the state machine */
-	if (this->type == PB_BATCH_CDATA)
-	{
-		state_machine->set_empty_cdata(state_machine,
-									   this->offset == this->encoding.len);
-	}
-	return SUCCESS;
-
-fatal:
-	this->errors->insert_last(this->errors, msg);
-	return FAILED;
-}
-
-static status_t process_tnc_msg(private_pb_tnc_batch_t *this)
-{
-	bio_reader_t *reader;
-	pb_tnc_msg_t *pb_tnc_msg, *msg;
-	u_int8_t flags;
-	u_int32_t vendor_id, msg_type, msg_len, offset;
-	chunk_t data, msg_value;
-	bool noskip_flag;
-	status_t status;
-
-	data = chunk_skip(this->encoding, this->offset);
-
-	if (data.len < PB_TNC_HEADER_SIZE)
-	{
-		DBG1(DBG_TNC, "%u bytes insufficient to parse PB-TNC message header",
-					  data.len);
-		msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, this->offset);
-		goto fatal;
-	}
-
-	reader = bio_reader_create(data);
-	reader->read_uint8 (reader, &flags);
-	reader->read_uint24(reader, &vendor_id);
-	reader->read_uint32(reader, &msg_type);
-	reader->read_uint32(reader, &msg_len);
-	reader->destroy(reader);
-
-	noskip_flag = (flags & PB_TNC_FLAG_NOSKIP) != PB_TNC_FLAG_NONE;
-
-	if (msg_len > data.len)
-	{
-		DBG1(DBG_TNC, "%u bytes insufficient to parse PB-TNC message", data.len);
-		msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, this->offset + 8);
-		goto fatal;
-	}
-
-	if (vendor_id == PEN_RESERVED)
-	{
-		DBG1(DBG_TNC, "Vendor ID 0x%06x is reserved", PEN_RESERVED);
-		msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, this->offset + 1);
-		goto fatal;
-
-	}
-
-	if (msg_type == PB_TNC_RESERVED_MSG_TYPE)
-	{
-		DBG1(DBG_TNC, "PB-TNC message Type 0x%08x is reserved",
-			 PB_TNC_RESERVED_MSG_TYPE);
-		msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, this->offset + 4);
-		goto fatal;
-	}
-
-
-	if (vendor_id != PEN_IETF || msg_type > PB_MSG_ROOF)
-	{
-		if (msg_len < PB_TNC_HEADER_SIZE)
-		{
-			DBG1(DBG_TNC, "%u bytes too small for PB-TNC message length",
-						   msg_len);
-			msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, this->offset + 8);
-			goto fatal;
-		}
-
-		if (noskip_flag)
-		{
-			DBG1(DBG_TNC, "reject PB-TNC message (Vendor ID 0x%06x / "
-						  "Type 0x%08x)", vendor_id, msg_type);
-			msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_UNSUPPORTED_MANDATORY_MSG, this->offset);
-			goto fatal;
-		}
-		else
-		{
-			DBG1(DBG_TNC, "ignore PB-TNC message (Vendor ID 0x%06x / "
-						  "Type 0x%08x)", vendor_id, msg_type);
-			this->offset += msg_len;
-			return SUCCESS;
-		}
-	}
-	else
-	{
-		if (msg_type == PB_MSG_EXPERIMENTAL && noskip_flag)
-		{
-			DBG1(DBG_TNC, "reject PB-Experimental message with NOSKIP flag set");
-			msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_UNSUPPORTED_MANDATORY_MSG, this->offset);
-			goto fatal;
-		}
-		if (pb_tnc_msg_infos[msg_type].has_noskip_flag != TRUE_OR_FALSE &&
-			pb_tnc_msg_infos[msg_type].has_noskip_flag != noskip_flag)
-		{
-			DBG1(DBG_TNC, "%N message must%s have NOSKIP flag set",
-				 pb_tnc_msg_type_names, msg_type,
-				 pb_tnc_msg_infos[msg_type].has_noskip_flag ? "" : " not");
-			msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-								PB_ERROR_INVALID_PARAMETER, this->offset);
-			goto fatal;
-		}
-
-		if (msg_len < pb_tnc_msg_infos[msg_type].min_size ||
-		   (pb_tnc_msg_infos[msg_type].exact_size &&
-			msg_len != pb_tnc_msg_infos[msg_type].min_size))
-		{
-			DBG1(DBG_TNC, "%N message length must be %s %u bytes but is %u bytes",
-				 pb_tnc_msg_type_names, msg_type,
-				 pb_tnc_msg_infos[msg_type].exact_size ? "exactly" : "at least",
-				 pb_tnc_msg_infos[msg_type].min_size, msg_len);
-			msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-								PB_ERROR_INVALID_PARAMETER, this->offset);
-			goto fatal;
-		}
-	}
-
-	if (pb_tnc_msg_infos[msg_type].in_result_batch &&
-		this->type != PB_BATCH_RESULT)
-	{
-		if (this->is_server)
-		{
-			DBG1(DBG_TNC,"reject %N message received from a PB-TNC client",
-						  pb_tnc_msg_type_names, msg_type);
-			msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-								PB_ERROR_INVALID_PARAMETER, this->offset);
-			goto fatal;
-		}
-		else
-		{
-			DBG1(DBG_TNC,"ignore %N message not received within RESULT batch",
-						  pb_tnc_msg_type_names, msg_type);
-			this->offset += msg_len;
-			return SUCCESS;
-		}
-	}
-
-	DBG2(DBG_TNC, "processing %N message (%u bytes)", pb_tnc_msg_type_names,
-				   msg_type, msg_len);
-	data.len = msg_len;
-	msg_value = chunk_skip(data, PB_TNC_HEADER_SIZE);
-	pb_tnc_msg = pb_tnc_msg_create_from_data(msg_type, msg_value);
-
-	status = pb_tnc_msg->process(pb_tnc_msg, &offset);
-	if (status == FAILED || status == VERIFY_ERROR)
-	{
-		msg = pb_error_msg_create_with_offset(TRUE, PEN_IETF,
-							PB_ERROR_INVALID_PARAMETER, this->offset + offset);
-		this->errors->insert_last(this->errors, msg);
-	}
-	if (status == FAILED)
-	{
-		pb_tnc_msg->destroy(pb_tnc_msg);
-		return FAILED;
-	}
-	this->messages->insert_last(this->messages, pb_tnc_msg);
-	this->offset += msg_len;
-	return status;
-
-fatal:
-	this->errors->insert_last(this->errors, msg);
-	return FAILED;
-}
-
-METHOD(pb_tnc_batch_t, process, status_t,
-	private_pb_tnc_batch_t *this, pb_tnc_state_machine_t *state_machine)
-{
-	status_t status;
-
-	status = process_batch_header(this, state_machine);
-	if (status != SUCCESS)
-	{
-		return FAILED;
-	}
-
-	while (this->offset < this->encoding.len)
-	{
-		switch (process_tnc_msg(this))
-		{
-			case FAILED:
-				return FAILED;
-			case VERIFY_ERROR:
-				status = VERIFY_ERROR;
-				break;
-			case SUCCESS:
-			default:
-				break;
-		}
-	}
-	return status;
-}
-
-METHOD(pb_tnc_batch_t, create_msg_enumerator, enumerator_t*,
-	private_pb_tnc_batch_t *this)
-{
-	return this->messages->create_enumerator(this->messages);
-}
-
-METHOD(pb_tnc_batch_t, create_error_enumerator, enumerator_t*,
-	private_pb_tnc_batch_t *this)
-{
-	return this->errors->create_enumerator(this->errors);
-}
-
-METHOD(pb_tnc_batch_t, destroy, void,
-	private_pb_tnc_batch_t *this)
-{
-	this->messages->destroy_offset(this->messages,
-								   offsetof(pb_tnc_msg_t, destroy));
-	this->errors->destroy_offset(this->errors,
-								   offsetof(pb_tnc_msg_t, destroy));
-	free(this->encoding.ptr);
-	free(this);
-}
-
-/**
- * See header
- */
-pb_tnc_batch_t* pb_tnc_batch_create(bool is_server, pb_tnc_batch_type_t type,
-									size_t max_batch_len)
-{
-	private_pb_tnc_batch_t *this;
-
-	INIT(this,
-		.public = {
-			.get_type = _get_type,
-			.get_encoding = _get_encoding,
-			.add_msg = _add_msg,
-			.build = _build,
-			.process = _process,
-			.create_msg_enumerator = _create_msg_enumerator,
-			.create_error_enumerator = _create_error_enumerator,
-			.destroy = _destroy,
-		},
-		.is_server = is_server,
-		.type = type,
-		.max_batch_len = max_batch_len,
-		.batch_len = PB_TNC_BATCH_HEADER_SIZE,
-		.messages = linked_list_create(),
-		.errors = linked_list_create(),
-	);
-
-	DBG2(DBG_TNC, "creating PB-TNC %N batch", pb_tnc_batch_type_names, type);
-
-	return &this->public;
-}
-
-/**
- * See header
- */
-pb_tnc_batch_t* pb_tnc_batch_create_from_data(bool is_server, chunk_t data)
-{
-	private_pb_tnc_batch_t *this;
-
-	INIT(this,
-		.public = {
-			.get_type = _get_type,
-			.get_encoding = _get_encoding,
-			.add_msg = _add_msg,
-			.build = _build,
-			.process = _process,
-			.create_msg_enumerator = _create_msg_enumerator,
-			.create_error_enumerator = _create_error_enumerator,
-			.destroy = _destroy,
-		},
-		.is_server = is_server,
-		.messages = linked_list_create(),
-		.errors = linked_list_create(),
-		.encoding = chunk_clone(data),
-	);
-
-	return &this->public;
-}
-
diff --git a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.h b/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.h
deleted file mode 100644
index 60cef7735..000000000
--- a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2010-2012 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 pb_tnc_batch pb_tnc_batch
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_TNC_BATCH_H_
-#define PB_TNC_BATCH_H_
-
-typedef enum pb_tnc_batch_type_t pb_tnc_batch_type_t;
-typedef struct pb_tnc_batch_t pb_tnc_batch_t;
-
-#include "messages/pb_tnc_msg.h"
-#include "state_machine/pb_tnc_state_machine.h"
-
-#include <library.h>
-
-/**
-  * PB-TNC Batch Types as defined in section 4.1 of RFC 5793
- */
-enum pb_tnc_batch_type_t {
-	PB_BATCH_NONE =		0,	/* for internal use only */
-	PB_BATCH_CDATA =	1,
-	PB_BATCH_SDATA =	2,
-	PB_BATCH_RESULT =	3,
-	PB_BATCH_CRETRY =	4,
-	PB_BATCH_SRETRY =	5,
-	PB_BATCH_CLOSE =	6,
-	PB_BATCH_ROOF =		6
-};
-
-/**
- * enum name for pb_tnc_batch_type_t.
- */
-extern enum_name_t *pb_tnc_batch_type_names;
-
-/**
- * Interface for all PB-TNC Batch Types.
- */
-struct pb_tnc_batch_t {
-
-	/**
-	 * Get the PB-TNC Message Type
-	 *
-	 * @return				PB-TNC batch type
-	 */
-	pb_tnc_batch_type_t (*get_type)(pb_tnc_batch_t *this);
-
-	/**
-	 * Get the encoding of the PB-TNC Batch
-	 *
-	 * @return				encoded PB-TNC batch
-	 */
-	chunk_t (*get_encoding)(pb_tnc_batch_t *this);
-
-	/**
-	 * Add a PB-TNC Message
-	 *
-	 * @param msg			PB-TNC message to be addedd
-	 * @return				TRUE if message fit into batch and was added
-	 */
-	bool (*add_msg)(pb_tnc_batch_t *this, pb_tnc_msg_t* msg);
-
-	/**
-	 * Build the PB-TNC Batch
-	 */
-	void (*build)(pb_tnc_batch_t *this);
-
-	/**
-	 * Process the PB-TNC Batch
-	 *
-	 * @param				PB-TNC state machine
-	 * @return				return processing status
-	 */
-	status_t (*process)(pb_tnc_batch_t *this,
-						pb_tnc_state_machine_t *state_machine);
-
-	/**
-	 * Enumerates over all PB-TNC Messages
-	 *
-	 * @return				return message enumerator
-	 */
-	enumerator_t* (*create_msg_enumerator)(pb_tnc_batch_t *this);
-
-	/**
-	 * Enumerates over all parsing errors
-	 *
-	 * @return				return error enumerator
-	 */
-	enumerator_t* (*create_error_enumerator)(pb_tnc_batch_t *this);
-
-	/**
-	 * Destroys a pb_tnc_batch_t object.
-	 */
-	void (*destroy)(pb_tnc_batch_t *this);
-};
-
-/**
- * Create an empty PB-TNC Batch of a given type
- *
- * @param is_server			TRUE if server, FALSE if client
- * @param type				PB-TNC batch type
- * @param max_batch_len		maximum size the PB-TNC batch
- */
-pb_tnc_batch_t* pb_tnc_batch_create(bool is_server, pb_tnc_batch_type_t type,
-									size_t max_batch_len);
-
-/**
- * Create an unprocessed PB-TNC Batch from data
- *
- * @param is_server			TRUE if server, FALSE if client
- * @param  data				encoded PB-TNC batch
- */
-pb_tnc_batch_t* pb_tnc_batch_create_from_data(bool is_server, chunk_t data);
-
-#endif /** PB_TNC_BATCH_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c
deleted file mode 100644
index cdd0d0d0d..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 "pb_access_recommendation_msg.h"
-
-#include <bio/bio_writer.h>
-#include <bio/bio_reader.h>
-#include <utils/debug.h>
-
-ENUM(pb_access_recommendation_code_names, PB_REC_ACCESS_ALLOWED, PB_REC_QUARANTINED,
-	"Access Allowed",
-	"Access Denied",
-	"Quarantined"
-);
-
-typedef struct private_pb_access_recommendation_msg_t private_pb_access_recommendation_msg_t;
-
-/**
- *   PB-Access-Recommendation message (see section 4.7 of RFC 5793)
- *
- *      0                   1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |          Reserved             |   Access Recommendation Code  |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-#define ACCESS_RECOMMENDATION_RESERVED	 	0x0000
-#define ACCESS_RECOMMENDATION_MSG_SIZE		4
-/**
- * Private data of a pb_access_recommendation_msg_t object.
- *
- */
-struct private_pb_access_recommendation_msg_t {
-	/**
-	 * Public pb_access_recommendation_msg_t interface.
-	 */
-	pb_access_recommendation_msg_t public;
-
-	/**
-	 * PB-TNC message type
-	 */
-	pb_tnc_msg_type_t type;
-
-	/**
-	 * Access recommendation code
-	 */
-	u_int16_t recommendation;
-
-	/**
-	 * Encoded message
-	 */
-	chunk_t encoding;
-};
-
-METHOD(pb_tnc_msg_t, get_type, pb_tnc_msg_type_t,
-	private_pb_access_recommendation_msg_t *this)
-{
-	return this->type;
-}
-
-METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
-	private_pb_access_recommendation_msg_t *this)
-{
-	return this->encoding;
-}
-
-METHOD(pb_tnc_msg_t, build, void,
-	private_pb_access_recommendation_msg_t *this)
-{
-	bio_writer_t *writer;
-
-	if (this->encoding.ptr)
-	{
-		return;
-	}
-	writer = bio_writer_create(ACCESS_RECOMMENDATION_MSG_SIZE);
-	writer->write_uint16(writer, ACCESS_RECOMMENDATION_RESERVED);
-	writer->write_uint16(writer, this->recommendation);
-	this->encoding = writer->get_buf(writer);
-	this->encoding = chunk_clone(this->encoding);
-	writer->destroy(writer);
-}
-
-METHOD(pb_tnc_msg_t, process, status_t,
-	private_pb_access_recommendation_msg_t *this, u_int32_t *offset)
-{
-	bio_reader_t *reader;
-	u_int16_t reserved;
-
-	reader = bio_reader_create(this->encoding);
-	reader->read_uint16(reader, &reserved);
-	reader->read_uint16(reader, &this->recommendation);
-	reader->destroy(reader);
-
-	if (this->recommendation < PB_REC_ACCESS_ALLOWED ||
-		this->recommendation > PB_REC_QUARANTINED)
-	{
-		DBG1(DBG_TNC, "invalid access recommendation code (%u)",
-					   this->recommendation);
-		*offset = 2;
-		return FAILED;
-	}
-
-	return SUCCESS;
-}
-
-METHOD(pb_tnc_msg_t, destroy, void,
-	private_pb_access_recommendation_msg_t *this)
-{
-	free(this->encoding.ptr);
-	free(this);
-}
-
-METHOD(pb_access_recommendation_msg_t, get_access_recommendation, u_int16_t,
-	private_pb_access_recommendation_msg_t *this)
-{
-	return this->recommendation;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_access_recommendation_msg_create_from_data(chunk_t data)
-{
-	private_pb_access_recommendation_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_access_recommendation = _get_access_recommendation,
-		},
-		.type = PB_MSG_ACCESS_RECOMMENDATION,
-		.encoding = chunk_clone(data),
-	);
-
-	return &this->public.pb_interface;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_access_recommendation_msg_create(u_int16_t recommendation)
-{
-	private_pb_access_recommendation_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_access_recommendation = _get_access_recommendation,
-		},
-		.type = PB_MSG_ACCESS_RECOMMENDATION,
-		.recommendation = recommendation,
-	);
-
-	return &this->public.pb_interface;
-}
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h
deleted file mode 100644
index 01b83cfd7..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 pb_access_recommendation_msg pb_access_recommendation_msg
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_ACCESS_RECOMMENDATION_MSG_H_
-#define PB_ACCESS_RECOMMENDATION_MSG_H_
-
-typedef enum pb_access_recommendation_code_t pb_access_recommendation_code_t;
-typedef struct pb_access_recommendation_msg_t pb_access_recommendation_msg_t;
-
-#include "pb_tnc_msg.h"
-
-/**
- * PB Access Recommendation Codes as defined in section 4.7 of RFC 5793
- */
-enum pb_access_recommendation_code_t {
-	PB_REC_ACCESS_ALLOWED =	1,
-	PB_REC_ACCESS_DENIED =	2,
-	PB_REC_QUARANTINED =	3,
-};
-
-/**
- * enum name for pb_access_recommendation_code_t.
- */
-extern enum_name_t *pb_access_recommendation_code_names;
-
-
-/**
- * Class representing the PB-Access-Recommendation message type.
- */
-struct pb_access_recommendation_msg_t {
-
-	/**
-	 * PB-TNC Message interface
-	 */
-	pb_tnc_msg_t pb_interface;
-
-	/**
-	 * Get PB Access Recommendation
-	 *
-	 * @return			PB Access Recommendation
-	 */
-	u_int16_t (*get_access_recommendation)(pb_access_recommendation_msg_t *this);
-};
-
-/**
- * Create a PB-Access-Recommendation message from parameters
- *
- * @param recommendation	Access Recommendation code
- */
-pb_tnc_msg_t* pb_access_recommendation_msg_create(u_int16_t recommendation);
-
-/**
- * Create an unprocessed PB-Access-Recommendation message from raw data
- *
-  * @param data		PB-Access-Recommendation message data
- */
-pb_tnc_msg_t* pb_access_recommendation_msg_create_from_data(chunk_t data);
-
-#endif /** PB_PA_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c
deleted file mode 100644
index 4e50446be..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 "pb_assessment_result_msg.h"
-
-#include <tncifimv.h>
-
-#include <bio/bio_writer.h>
-#include <bio/bio_reader.h>
-#include <utils/debug.h>
-
-typedef struct private_pb_assessment_result_msg_t private_pb_assessment_result_msg_t;
-
-/**
- *   PB-Assessment-Result message (see section 4.6 of RFC 5793)
- *
- *                          1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                       Assessment Result                       |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-#define ASSESSMENT_RESULT_MSG_SIZE	4
-
-/**
- * Private data of a pb_assessment_result_msg_t object.
- *
- */
-struct private_pb_assessment_result_msg_t {
-	/**
-	 * Public pb_assessment_result_msg_t interface.
-	 */
-	pb_assessment_result_msg_t public;
-
-	/**
-	 * PB-TNC message type
-	 */
-	pb_tnc_msg_type_t type;
-
-	/**
-	 * Assessment result code
-	 */
-	u_int32_t assessment_result;
-
-	/**
-	 * Encoded message
-	 */
-	chunk_t encoding;
-};
-
-METHOD(pb_tnc_msg_t, get_type, pb_tnc_msg_type_t,
-	private_pb_assessment_result_msg_t *this)
-{
-	return this->type;
-}
-
-METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
-	private_pb_assessment_result_msg_t *this)
-{
-	return this->encoding;
-}
-
-METHOD(pb_tnc_msg_t, build, void,
-	private_pb_assessment_result_msg_t *this)
-{
-	bio_writer_t *writer;
-
-	if (this->encoding.ptr)
-	{
-		return;
-	}
-	writer = bio_writer_create(ASSESSMENT_RESULT_MSG_SIZE);
-	writer->write_uint32(writer, this->assessment_result);
-	this->encoding = writer->get_buf(writer);
-	this->encoding = chunk_clone(this->encoding);
-	writer->destroy(writer);
-}
-
-METHOD(pb_tnc_msg_t, process, status_t,
-	private_pb_assessment_result_msg_t *this, u_int32_t *offset)
-{
-	bio_reader_t *reader;
-
-	reader = bio_reader_create(this->encoding);
-	reader->read_uint32(reader, &this->assessment_result);
-	reader->destroy(reader);
-
-	if (this->assessment_result < TNC_IMV_EVALUATION_RESULT_COMPLIANT ||
-		this->assessment_result > TNC_IMV_EVALUATION_RESULT_DONT_KNOW)
-	{
-		DBG1(DBG_TNC, "invalid assessment result (%u)",
-					   this->assessment_result);
-		*offset = 0;
-		return FAILED;
-	}
-
-	return SUCCESS;
-}
-
-METHOD(pb_tnc_msg_t, destroy, void,
-	private_pb_assessment_result_msg_t *this)
-{
-	free(this->encoding.ptr);
-	free(this);
-}
-
-METHOD(pb_assessment_result_msg_t, get_assessment_result, u_int32_t,
-	private_pb_assessment_result_msg_t *this)
-{
-	return this->assessment_result;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_assessment_result_msg_create_from_data(chunk_t data)
-{
-	private_pb_assessment_result_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_assessment_result = _get_assessment_result,
-		},
-		.type = PB_MSG_ASSESSMENT_RESULT,
-		.encoding = chunk_clone(data),
-	);
-
-	return &this->public.pb_interface;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_assessment_result_msg_create(u_int32_t assessment_result)
-{
-	private_pb_assessment_result_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_assessment_result = _get_assessment_result,
-		},
-		.type = PB_MSG_ASSESSMENT_RESULT,
-		.assessment_result = assessment_result,
-	);
-
-	return &this->public.pb_interface;
-}
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.h
deleted file mode 100644
index d2b005114..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 pb_assessment_result_msg pb_assessment_result_msg
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_ASSESSMENT_RESULT_MSG_H_
-#define PB_ASSESSMENT_RESULT_MSG_H_
-
-typedef struct pb_assessment_result_msg_t pb_assessment_result_msg_t;
-
-#include "pb_tnc_msg.h"
-
-/**
- * Class representing the PB-Assessment-Result message type.
- */
-struct pb_assessment_result_msg_t {
-
-	/**
-	 * PB-TNC Message interface
-	 */
-	pb_tnc_msg_t pb_interface;
-
-	/**
-	 * Get PB Assessment result
-	 *
-	 * @return			PB Assessment result
-	 */
-	u_int32_t (*get_assessment_result)(pb_assessment_result_msg_t *this);
-};
-
-/**
- * Create a PB-Assessment-Result message from parameters
- *
- * @param assessment_result		Assessment result code
- */
-pb_tnc_msg_t* pb_assessment_result_msg_create(u_int32_t assessment_result);
-
-/**
- * Create an unprocessed PB-Assessment-Result message from raw data
- *
-  * @param data		PB-Assessment-Result message data
- */
-pb_tnc_msg_t* pb_assessment_result_msg_create_from_data(chunk_t data);
-
-#endif /** PB_PA_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c
deleted file mode 100644
index d048f437c..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 "pb_error_msg.h"
-
-#include <tnc/tnccs/tnccs.h>
-
-#include <bio/bio_writer.h>
-#include <bio/bio_reader.h>
-#include <pen/pen.h>
-#include <utils/debug.h>
-
-ENUM(pb_tnc_error_code_names, PB_ERROR_UNEXPECTED_BATCH_TYPE,
-							  PB_ERROR_VERSION_NOT_SUPPORTED,
-	"Unexpected Batch Type",
-	"Invalid Parameter",
-	"Local Error",
-	"Unsupported Mandatory Message",
-	"Version Not Supported"
-);
-
-typedef struct private_pb_error_msg_t private_pb_error_msg_t;
-
-/**
- *   PB-Error message (see section 4.9 of RFC 5793)
- *
- *      0                   1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |    Flags      |              Error Code Vendor ID             |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |           Error Code          |           Reserved            |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                Error Parameters (Variable Length)             |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-#define ERROR_FLAG_NONE		0x00
-#define ERROR_FLAG_FATAL	(1<<7)
-#define ERROR_RESERVED	 	0x0000
-#define ERROR_HEADER_SIZE	8
-
-/**
- * Private data of a pb_error_msg_t object.
- *
- */
-struct private_pb_error_msg_t {
-	/**
-	 * Public pb_error_msg_t interface.
-	 */
-	pb_error_msg_t public;
-
-	/**
-	 * PB-TNC message type
-	 */
-	pb_tnc_msg_type_t type;
-
-	/**
-	 * Fatal flag
-	 */
-	bool fatal;
-
-	/**
-	 * PB Error Code Vendor ID
-	 */
-	u_int32_t vendor_id;
-
-	/**
-	 * PB Error Code
-	 */
-	u_int16_t error_code;
-
-	/**
-	 * PB Error Offset
-	 */
-	u_int32_t error_offset;
-
-	/**
-	 * Bad PB-TNC version received
-	 */
-	u_int8_t bad_version;
-
-	/**
-	 * Encoded message
-	 */
-	chunk_t encoding;
-
-	/**
-	 * reference count
-	 */
-	refcount_t ref;
-};
-
-METHOD(pb_tnc_msg_t, get_type, pb_tnc_msg_type_t,
-	private_pb_error_msg_t *this)
-{
-	return this->type;
-}
-
-METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
-	private_pb_error_msg_t *this)
-{
-	return this->encoding;
-}
-
-METHOD(pb_tnc_msg_t, build, void,
-	private_pb_error_msg_t *this)
-{
-	bio_writer_t *writer;
-
-	if (this->encoding.ptr)
-	{
-		return;
-	}
-
-	/* build message header */
-	writer = bio_writer_create(ERROR_HEADER_SIZE);
-	writer->write_uint8 (writer, this->fatal ?
-						 ERROR_FLAG_FATAL : ERROR_FLAG_NONE);
-	writer->write_uint24(writer, this->vendor_id);
-	writer->write_uint16(writer, this->error_code);
-	writer->write_uint16(writer, ERROR_RESERVED);
-
-	/* build message body */
-	if (this->error_code == PB_ERROR_VERSION_NOT_SUPPORTED)
-	{
-		/* Bad version */
-		writer->write_uint8(writer, this->bad_version);
-		writer->write_uint8(writer, PB_TNC_VERSION); /* Max version */
-		writer->write_uint8(writer, PB_TNC_VERSION); /* Min version */
-		writer->write_uint8(writer, 0x00);           /* Reserved */
-	}
-	else
-	{
-		/* Error Offset */
-		writer->write_uint32(writer, this->error_offset);
-	}
-	this->encoding = writer->get_buf(writer);
-	this->encoding = chunk_clone(this->encoding);
-	writer->destroy(writer);
-}
-
-METHOD(pb_tnc_msg_t, process, status_t,
-	private_pb_error_msg_t *this, u_int32_t *offset)
-{
-	u_int8_t flags, max_version, min_version;
-	u_int16_t reserved;
-	bio_reader_t *reader;
-
-	if (this->encoding.len < ERROR_HEADER_SIZE)
-	{
-		DBG1(DBG_TNC,"%N message is shorter than header size of %u bytes",
-			 pb_tnc_msg_type_names, PB_MSG_ERROR, ERROR_HEADER_SIZE);
-		*offset = 0;
-		return FAILED;
-	}
-
-	/* process message header */
-	reader = bio_reader_create(this->encoding);
-	reader->read_uint8 (reader, &flags);
-	reader->read_uint24(reader, &this->vendor_id);
-	reader->read_uint16(reader, &this->error_code);
-	reader->read_uint16(reader, &reserved);
-	this->fatal = (flags & ERROR_FLAG_FATAL) != ERROR_FLAG_NONE;
-
-	if (this->vendor_id == PEN_IETF && reader->remaining(reader) == 4)
-	{
-		if (this->error_code == PB_ERROR_VERSION_NOT_SUPPORTED)
-		{
-			reader->read_uint8(reader, &this->bad_version);
-			reader->read_uint8(reader, &max_version);
-			reader->read_uint8(reader, &min_version);
-		}
-		else
-		{
-			reader->read_uint32(reader, &this->error_offset);
-		}
-	}
-	reader->destroy(reader);
-
-	return SUCCESS;
-}
-
-METHOD(pb_tnc_msg_t, get_ref, pb_tnc_msg_t*,
-	private_pb_error_msg_t *this)
-{
-	ref_get(&this->ref);
-	return &this->public.pb_interface;
-}
-
-METHOD(pb_tnc_msg_t, destroy, void,
-	private_pb_error_msg_t *this)
-{
-	if (ref_put(&this->ref))
-	{
-		free(this->encoding.ptr);
-		free(this);
-	}
-}
-
-METHOD(pb_error_msg_t, get_fatal_flag, bool,
-	private_pb_error_msg_t *this)
-{
-	return this->fatal;
-}
-
-METHOD(pb_error_msg_t, get_vendor_id, u_int32_t,
-	private_pb_error_msg_t *this)
-{
-	return this->vendor_id;
-}
-
-METHOD(pb_error_msg_t, get_error_code, u_int16_t,
-	private_pb_error_msg_t *this)
-{
-	return this->error_code;
-}
-
-METHOD(pb_error_msg_t, get_offset, u_int32_t,
-	private_pb_error_msg_t *this)
-{
-	return this->error_offset;
-}
-
-METHOD(pb_error_msg_t, get_bad_version, u_int8_t,
-	private_pb_error_msg_t *this)
-{
-	return this->bad_version;
-}
-
-METHOD(pb_error_msg_t, set_bad_version, void,
-	private_pb_error_msg_t *this, u_int8_t version)
-{
-	this->bad_version = version;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t* pb_error_msg_create(bool fatal, u_int32_t vendor_id,
-								  pb_tnc_error_code_t error_code)
-{
-	private_pb_error_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.get_ref = _get_ref,
-				.destroy = _destroy,
-			},
-			.get_fatal_flag = _get_fatal_flag,
-			.get_vendor_id = _get_vendor_id,
-			.get_error_code = _get_error_code,
-			.get_offset = _get_offset,
-			.get_bad_version = _get_bad_version,
-			.set_bad_version = _set_bad_version,
-		},
-		.type = PB_MSG_ERROR,
-		.ref = 1,
-		.fatal = fatal,
-		.vendor_id = vendor_id,
-		.error_code = error_code,
-	);
-
-	return &this->public.pb_interface;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t* pb_error_msg_create_with_offset(bool fatal, u_int32_t vendor_id,
-											  pb_tnc_error_code_t error_code,
-											  u_int32_t error_offset)
-{
-	private_pb_error_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.get_ref = _get_ref,
-				.destroy = _destroy,
-			},
-			.get_fatal_flag = _get_fatal_flag,
-			.get_vendor_id = _get_vendor_id,
-			.get_error_code = _get_error_code,
-			.get_offset = _get_offset,
-			.get_bad_version = _get_bad_version,
-			.set_bad_version = _set_bad_version,
-		},
-		.type = PB_MSG_ERROR,
-		.ref = 1,
-		.fatal = fatal,
-		.vendor_id = vendor_id,
-		.error_code = error_code,
-		.error_offset = error_offset,
-	);
-
-	return &this->public.pb_interface;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_error_msg_create_from_data(chunk_t data)
-{
-	private_pb_error_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.get_ref = _get_ref,
-				.destroy = _destroy,
-			},
-			.get_fatal_flag = _get_fatal_flag,
-			.get_vendor_id = _get_vendor_id,
-			.get_error_code = _get_error_code,
-			.get_offset = _get_offset,
-			.get_bad_version = _get_bad_version,
-			.set_bad_version = _set_bad_version,
-		},
-		.type = PB_MSG_ERROR,
-		.ref = 1,
-		.encoding = chunk_clone(data),
-	);
-
-	return &this->public.pb_interface;
-}
-
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.h
deleted file mode 100644
index 8b92742b5..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 pb_error_msg pb_error_msg
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_ERROR_MSG_H_
-#define PB_ERROR_MSG_H_
-
-typedef enum pb_tnc_error_code_t pb_tnc_error_code_t;
-typedef struct pb_error_msg_t pb_error_msg_t;
-
-#include "pb_tnc_msg.h"
-
-/**
- * PB-TNC Error Codes as defined in section 4.9.1 of RFC 5793
- */
-enum  pb_tnc_error_code_t {
-	PB_ERROR_UNEXPECTED_BATCH_TYPE =		0,
-	PB_ERROR_INVALID_PARAMETER =			1,
-	PB_ERROR_LOCAL_ERROR =					2,
-	PB_ERROR_UNSUPPORTED_MANDATORY_MSG =	3,
-	PB_ERROR_VERSION_NOT_SUPPORTED =		4
-};
-
-/**
- * enum name for pb_tnc_error_code_t.
- */
-extern enum_name_t *pb_tnc_error_code_names;
-
-/**
- * Class representing the PB-Error message type.
- */
-struct pb_error_msg_t {
-
-	/**
-	 * PB-TNC Message interface
-	 */
-	pb_tnc_msg_t pb_interface;
-
-	/**
-	 * Get the fatal flag
-	 *
-	 * @return				fatal flag
-	 */
-	bool (*get_fatal_flag)(pb_error_msg_t *this);
-
-	/**
-	 * Get PB Error code Vendor ID
-	 *
-	 * @return				PB Error Code Vendor ID
-	 */
-	u_int32_t (*get_vendor_id)(pb_error_msg_t *this);
-
-	/**
-	 * Get PB Error Code
-	 *
-	 * @return				PB Error Code
-	 */
-	u_int16_t (*get_error_code)(pb_error_msg_t *this);
-
-	/**
-	 * Get the PB Error Offset
-	 *
-	 * @return				PB Error Offset
-	 */
-	u_int32_t (*get_offset)(pb_error_msg_t *this);
-
-	/**
-	 * Get the PB Bad Version
-	 *
-	 * @return				PB Bad Version
-	 */
-	u_int8_t (*get_bad_version)(pb_error_msg_t *this);
-
-	/**
-	 * Set the PB Bad Version
-	 *
-	 * @param version		PB Bad Version
-	 */
-	void (*set_bad_version)(pb_error_msg_t *this, u_int8_t version);
-};
-
-/**
- * Create a PB-Error message from parameters
- *
- * @param fatal				fatal flag
- * @param vendor_id			Error Code Vendor ID
- * @param error_code		Error Code
- */
-pb_tnc_msg_t* pb_error_msg_create(bool fatal, u_int32_t vendor_id,
-								  pb_tnc_error_code_t error_code);
-	
-/**
- * Create a PB-Error message from parameters with offset field
- *
- * @param fatal				fatal flag
- * @param vendor_id			Error Code Vendor ID
- * @param error_code		Error Code
- * @param error_offset		Error Offset
- */
-pb_tnc_msg_t* pb_error_msg_create_with_offset(bool fatal, u_int32_t vendor_id,
-											  pb_tnc_error_code_t error_code,
-											  u_int32_t error_offset);
-
-/**
- * Create an unprocessed PB-Error message from raw data
- *
- * @param data				PB-Error message data
- */
-pb_tnc_msg_t* pb_error_msg_create_from_data(chunk_t data);
-
-#endif /** PB_PA_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.c
deleted file mode 100644
index 7dfba136f..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.c
+++ /dev/null
@@ -1,102 +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.
- */
-
-#include "pb_experimental_msg.h"
-
-typedef struct private_pb_experimental_msg_t private_pb_experimental_msg_t;
-
-/**
- * Private data of a pb_experimental_msg_t object.
- *
- */
-struct private_pb_experimental_msg_t {
-	/**
-	 * Public pb_experimental_msg_t interface.
-	 */
-	pb_experimental_msg_t public;
-
-	/**
-	 * PB-TNC message type
-	 */
-	pb_tnc_msg_type_t type;
-
-	/**
-	 * Encoded message
-	 */
-	chunk_t encoding;
-};
-
-METHOD(pb_tnc_msg_t, get_type, pb_tnc_msg_type_t,
-	private_pb_experimental_msg_t *this)
-{
-	return this->type;
-}
-
-METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
-	private_pb_experimental_msg_t *this)
-{
-	return this->encoding;
-}
-
-METHOD(pb_tnc_msg_t, build, void,
-	private_pb_experimental_msg_t *this)
-{
-	/* nothing to do since message contents equal encoding */
-}
-
-METHOD(pb_tnc_msg_t, process, status_t,
-	private_pb_experimental_msg_t *this, u_int32_t *offset)
-{
-	return SUCCESS;
-}
-
-METHOD(pb_tnc_msg_t, destroy, void,
-	private_pb_experimental_msg_t *this)
-{
-	free(this->encoding.ptr);
-	free(this);
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_experimental_msg_create_from_data(chunk_t data)
-{
-	private_pb_experimental_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-		},
-		.type = PB_MSG_EXPERIMENTAL,
-		.encoding = chunk_clone(data),
-	);
-
-	return &this->public.pb_interface;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_experimental_msg_create(chunk_t body)
-{
-	return pb_experimental_msg_create_from_data(body);
-}
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.h
deleted file mode 100644
index b1cc4f46e..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 pb_experimental_msg pb_experimental_msg
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_EXPERIMENTAL_MSG_H_
-#define PB_EXPERIMENTAL_MSG_H_
-
-typedef struct pb_experimental_msg_t pb_experimental_msg_t;
-
-#include "pb_tnc_msg.h"
-
-/**
- * Class representing the PB-Experimental message type.
- */
-struct pb_experimental_msg_t {
-
-	/**
-	 * PB-TNC Message interface
-	 */
-	pb_tnc_msg_t pb_interface;
-};
-
-/**
- * Create a PB-Experimental message from parameters
- *
- * @param body			message body
- */
-pb_tnc_msg_t* pb_experimental_msg_create(chunk_t body);
-
-/**
- * Create an unprocessed PB-Experimental message from raw data
- *
- * @param data			PB-Experimental message data
- */
-pb_tnc_msg_t* pb_experimental_msg_create_from_data(chunk_t data);
-
-#endif /** PB_EXPERIMENTAL_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c
deleted file mode 100644
index 70a03cdc5..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 "pb_language_preference_msg.h"
-
-#include <bio/bio_writer.h>
-#include <bio/bio_reader.h>
-#include <utils/debug.h>
-
-typedef struct private_pb_language_preference_msg_t private_pb_language_preference_msg_t;
-
-/**
- *   PB-Language-Preference message (see section 4.10 of RFC 5793)
- *
- *      0                   1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |              Language Preference (Variable Length)            |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-#define PB_LANG_PREFIX			"Accept-Language: "
-#define PB_LANG_PREFIX_LEN		strlen(PB_LANG_PREFIX)
-
-/**
- * Private data of a pb_language_preference_msg_t object.
- *
- */
-struct private_pb_language_preference_msg_t {
-	/**
-	 * Public pb_access_recommendation_msg_t interface.
-	 */
-	pb_language_preference_msg_t public;
-
-	/**
-	 * PB-TNC message type
-	 */
-	pb_tnc_msg_type_t type;
-
-	/**
-	 * Language preference
-	 */
-	chunk_t language_preference;
-
-	/**
-	 * Encoded message
-	 */
-	chunk_t encoding;
-};
-
-METHOD(pb_tnc_msg_t, get_type, pb_tnc_msg_type_t,
-	private_pb_language_preference_msg_t *this)
-{
-	return this->type;
-}
-
-METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
-	private_pb_language_preference_msg_t *this)
-{
-	return this->encoding;
-}
-
-METHOD(pb_tnc_msg_t, build, void,
-	private_pb_language_preference_msg_t *this)
-{
-	if (this->encoding.ptr)
-	{
-		return;
-	}
-	this->encoding = chunk_cat("cc",
-		 	 			chunk_create(PB_LANG_PREFIX, PB_LANG_PREFIX_LEN),
-						this->language_preference);
-}
-
-METHOD(pb_tnc_msg_t, process, status_t,
-	private_pb_language_preference_msg_t *this, u_int32_t *offset)
-{
-	chunk_t lang;
-
-	if (this->encoding.len >= PB_LANG_PREFIX_LEN &&
-		memeq(this->encoding.ptr, PB_LANG_PREFIX, PB_LANG_PREFIX_LEN))
-	{
-		lang = chunk_skip(this->encoding, PB_LANG_PREFIX_LEN);
-		this->language_preference = lang.len ? chunk_clone(lang) : chunk_empty;
-	}
-	else
-    {
-		DBG1(DBG_TNC, "language preference must be preceded by '%s'",
-					   PB_LANG_PREFIX);
-		*offset = 0;
-		return FAILED;
-	}
-
-	if (this->language_preference.len &&
-		this->language_preference.ptr[this->language_preference.len-1] == '\0')
-	{
-		DBG1(DBG_TNC, "language preference must not be null terminated");
-		*offset = PB_LANG_PREFIX_LEN + this->language_preference.len - 1;
-		return FAILED;
-	}
-
-	return SUCCESS;
-}
-
-METHOD(pb_tnc_msg_t, destroy, void,
-	private_pb_language_preference_msg_t *this)
-{
-	free(this->encoding.ptr);
-	free(this->language_preference.ptr);
-	free(this);
-}
-
-METHOD(pb_language_preference_msg_t, get_language_preference, chunk_t,
-	private_pb_language_preference_msg_t *this)
-{
-	return this->language_preference;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_language_preference_msg_create_from_data(chunk_t data)
-{
-	private_pb_language_preference_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_language_preference = _get_language_preference,
-		},
-		.type = PB_MSG_LANGUAGE_PREFERENCE,
-		.encoding = chunk_clone(data),
-	);
-
-	return &this->public.pb_interface;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_language_preference_msg_create(chunk_t language_preference)
-{
-	private_pb_language_preference_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_language_preference = _get_language_preference,
-		},
-		.type = PB_MSG_LANGUAGE_PREFERENCE,
-		.language_preference = chunk_clone(language_preference),
-	);
-
-	return &this->public.pb_interface;
-}
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.h
deleted file mode 100644
index 17106f6fa..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 pb_language_preference_msg pb_language_preference_msg
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_LANGUAGE_PREFERENCE_MSG_H_
-#define PB_LANGUAGE_PREFERENCE_MSG_H_
-
-typedef struct pb_language_preference_msg_t pb_language_preference_msg_t;
-
-#include "pb_tnc_msg.h"
-
-/**
- * Class representing the PB-Language-Preference message type.
- */
-struct pb_language_preference_msg_t {
-
-	/**
-	 * PB-TNC Message interface
-	 */
-	pb_tnc_msg_t pb_interface;
-
-	/**
-	 * Get PB Language Preference
-	 *
-	 * @return			Language preference
-	 */
-	chunk_t (*get_language_preference)(pb_language_preference_msg_t *this);
-};
-
-/**
- * Create a PB-Language-Preference message from parameters
- *
- * @param language_preference		Preferred language(s)
- */
-pb_tnc_msg_t* pb_language_preference_msg_create(chunk_t language_preference);
-
-/**
- * Create an unprocessed PB-Language-Preference message from raw data
- *
-  * @param data		PB-Language-Preference message data
- */
-pb_tnc_msg_t* pb_language_preference_msg_create_from_data(chunk_t data);
-
-#endif /** PB_PA_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c
deleted file mode 100644
index aa5e9c723..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyanbuu
- * 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 "pb_pa_msg.h"
-
-#include <tnc/tnccs/tnccs.h>
-
-#include <bio/bio_writer.h>
-#include <bio/bio_reader.h>
-#include <pen/pen.h>
-#include <utils/debug.h>
-
-typedef struct private_pb_pa_msg_t private_pb_pa_msg_t;
-
-/**
- *   PB-PA message
- *
- *      0                   1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |    Flags      |               PA Message Vendor ID            |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                           PA Subtype                          |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |  Posture Collector Identifier | Posture Validator Identifier  |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                 PA Message Body (Variable Length)             |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-#define PA_FLAG_NONE			0x00
-#define PA_FLAG_EXCL			(1<<7)
-#define PA_RESERVED_SUBTYPE		0xffffffff
-
-
-/**
- * Private data of a pb_pa_msg_t object.
- *
- */
-struct private_pb_pa_msg_t {
-	/**
-	 * Public pb_pa_msg_t interface.
-	 */
-	pb_pa_msg_t public;
-
-	/**
-	 * PB-TNC message type
-	 */
-	pb_tnc_msg_type_t type;
-
-	/**
-	 * Exclusive flag
-	 */
-	bool excl;
-
-	/**
-	 * Vendor-specific PA Subtype
-	 */
-	pen_type_t subtype;
-
-	/**
-	 * Posture Validator Identifier
-	 */
-	u_int16_t collector_id;
-
-	/**
-	 * Posture Validator Identifier
-	 */
-	u_int16_t validator_id;
-
-	/**
-	 * PA Message Body
-	 */
-	chunk_t msg_body;
-
-	/**
-	 * Encoded message
-	 */
-	chunk_t encoding;
-};
-
-METHOD(pb_tnc_msg_t, get_type, pb_tnc_msg_type_t,
-	private_pb_pa_msg_t *this)
-{
-	return this->type;
-}
-
-METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
-	private_pb_pa_msg_t *this)
-{
-	return this->encoding;
-}
-
-METHOD(pb_tnc_msg_t, build, void,
-	private_pb_pa_msg_t *this)
-{
-	chunk_t msg_header;
-	bio_writer_t *writer;
-
-	if (this->encoding.ptr)
-	{
-		return;
-	}
-
-	/* build message header */
-	writer = bio_writer_create(64);
-	writer->write_uint8 (writer, this->excl ? PA_FLAG_EXCL : PA_FLAG_NONE);
-	writer->write_uint24(writer, this->subtype.vendor_id);
-	writer->write_uint32(writer, this->subtype.type);
-	writer->write_uint16(writer, this->collector_id);
-	writer->write_uint16(writer, this->validator_id);
-	msg_header = writer->get_buf(writer);
-
-	/* create encoding by concatenating message header and message body */
-	this->encoding = chunk_cat("cc", msg_header, this->msg_body);
-	writer->destroy(writer);
-}
-
-METHOD(pb_tnc_msg_t, process, status_t,
-	private_pb_pa_msg_t *this, u_int32_t *offset)
-{
-	u_int8_t flags;
-	size_t msg_body_len;
-	bio_reader_t *reader;
-
-	/* process message header */
-	reader = bio_reader_create(this->encoding);
-	reader->read_uint8 (reader, &flags);
-	reader->read_uint24(reader, &this->subtype.vendor_id);
-	reader->read_uint32(reader, &this->subtype.type);
-	reader->read_uint16(reader, &this->collector_id);
-	reader->read_uint16(reader, &this->validator_id);
-	this->excl = ((flags & PA_FLAG_EXCL) != PA_FLAG_NONE);
-
-	/* process message body */
-	msg_body_len = reader->remaining(reader);
-	if (msg_body_len)
-	{
-		reader->read_data(reader, msg_body_len, &this->msg_body);
-		this->msg_body = chunk_clone(this->msg_body);
-	}
-	reader->destroy(reader);
-
-	if (this->subtype.vendor_id == PEN_RESERVED)
-	{
-		DBG1(DBG_TNC, "Vendor ID 0x%06x is reserved", PEN_RESERVED);
-		*offset = 1;
-		return FAILED;
-	}
-
-	if (this->subtype.type == PA_RESERVED_SUBTYPE)
-	{
-		DBG1(DBG_TNC, "PA Subtype 0x%08x is reserved", PA_RESERVED_SUBTYPE);
-		*offset = 4;
-		return FAILED;
-	}
-
-	return SUCCESS;
-}
-
-METHOD(pb_tnc_msg_t, destroy, void,
-	private_pb_pa_msg_t *this)
-{
-	free(this->encoding.ptr);
-	free(this->msg_body.ptr);
-	free(this);
-}
-
-METHOD(pb_pa_msg_t, get_subtype, pen_type_t,
-	private_pb_pa_msg_t *this)
-{
-	return this->subtype;
-}
-
-METHOD(pb_pa_msg_t, get_collector_id, u_int16_t,
-	private_pb_pa_msg_t *this)
-{
-	return this->collector_id;
-}
-
-METHOD(pb_pa_msg_t, get_validator_id, u_int16_t,
-	private_pb_pa_msg_t *this)
-{
-	return this->validator_id;
-}
-
-METHOD(pb_pa_msg_t, get_body, chunk_t,
-	private_pb_pa_msg_t *this)
-{
-	return this->msg_body;
-}
-
-METHOD(pb_pa_msg_t, get_exclusive_flag, bool,
-	private_pb_pa_msg_t *this)
-{
-	return this->excl;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_pa_msg_create_from_data(chunk_t data)
-{
-	private_pb_pa_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_subtype = _get_subtype,
-			.get_collector_id = _get_collector_id,
-			.get_validator_id = _get_validator_id,
-			.get_body = _get_body,
-			.get_exclusive_flag = _get_exclusive_flag,
-		},
-		.type = PB_MSG_PA,
-		.encoding = chunk_clone(data),
-	);
-
-	return &this->public.pb_interface;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_pa_msg_create(u_int32_t vendor_id, u_int32_t subtype,
-							   u_int16_t collector_id, u_int16_t validator_id,
-							   bool excl, chunk_t msg_body)
-{
-	private_pb_pa_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_subtype= _get_subtype,
-			.get_collector_id = _get_collector_id,
-			.get_validator_id = _get_validator_id,
-			.get_body = _get_body,
-			.get_exclusive_flag = _get_exclusive_flag,
-		},
-		.type = PB_MSG_PA,
-		.subtype = { vendor_id, subtype },
-		.collector_id = collector_id,
-		.validator_id = validator_id,
-		.excl = excl,
-		.msg_body = chunk_clone(msg_body),
-	);
-
-	return &this->public.pb_interface;
-}
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.h
deleted file mode 100644
index 5c9b7c0bf..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.h
+++ /dev/null
@@ -1,98 +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 pb_pa_msg pb_pa_msg
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_PA_MSG_H_
-#define PB_PA_MSG_H_
-
-typedef struct pb_pa_msg_t pb_pa_msg_t;
-
-#include "pb_tnc_msg.h"
-
-#include <pen/pen.h>
-
-/**
- * Class representing the PB-PA message type.
- */
-struct pb_pa_msg_t {
-
-	/**
-	 * PB-TNC Message interface
-	 */
-	pb_tnc_msg_t pb_interface;
-
-	/**
-	 * Get PA Message Vendor ID and Subtype
-	 *
-	 * @return				Vendor-specific PA Subtype
-	 */
-	pen_type_t (*get_subtype)(pb_pa_msg_t *this);
-
-	/**
-	 * Get Posture Collector ID
-	 *
-	 * @return				Posture Collector ID
-	 */
-	u_int16_t (*get_collector_id)(pb_pa_msg_t *this);
-
-	/**
-	 * Get Posture Validator ID
-	 *
-	 * @return				Posture Validator ID
-	 */
-	u_int16_t (*get_validator_id)(pb_pa_msg_t *this);
-
-	/**
-	 * Get the PA Message Body
-	 *
-	 * @return				PA Message Body
-	 */
-	chunk_t (*get_body)(pb_pa_msg_t *this);
-
-	/**
-	 * Get the exclusive flag
-	 *
-	 * @return				exclusive flag
-	 */
-	bool (*get_exclusive_flag)(pb_pa_msg_t *this);
-
-};
-
-/**
- * Create a PB-PA message from parameters
- *
- * @param vendor_id			PA Message Vendor ID
- * @param subtype			PA Subtype		
- * @param collector_id		Posture Collector ID
- * @param validator_id		Posture Validator ID
- * @param excl				Exclusive Flag
- * @param msg_body		 	PA Message Body
- */
-pb_tnc_msg_t *pb_pa_msg_create(u_int32_t vendor_id, u_int32_t subtype,
-							   u_int16_t collector_id, u_int16_t validator_id,
-							   bool excl, chunk_t msg_body);
-
-/**
- * Create an unprocessed PB-PA message from raw data
- *
-  * @param data		PB-PA message data
- */
-pb_tnc_msg_t* pb_pa_msg_create_from_data(chunk_t data);
-
-#endif /** PB_PA_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c
deleted file mode 100644
index 935c52d7b..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 "pb_reason_string_msg.h"
-
-#include <bio/bio_writer.h>
-#include <bio/bio_reader.h>
-#include <utils/debug.h>
-
-typedef struct private_pb_reason_string_msg_t private_pb_reason_string_msg_t;
-
-/**
- *   PB-Language-Preference message (see section 4.11 of RFC 5793)
- *
- *      0                   1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                      Reason String Length                     |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                Reason String (Variable Length)                |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     | Lang Code Len | Reason String Language Code (Variable Length) |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-/**
- * Private data of a pb_reason_string_msg_t object.
- *
- */
-struct private_pb_reason_string_msg_t {
-	/**
-	 * Public pb_reason_string_msg_t interface.
-	 */
-	pb_reason_string_msg_t public;
-
-	/**
-	 * PB-TNC message type
-	 */
-	pb_tnc_msg_type_t type;
-
-	/**
-	 * Reason string
-	 */
-	chunk_t reason_string;
-
-	/**
-	 * Language code
-	 */
-	chunk_t language_code;
-
-	/**
-	 * Encoded message
-	 */
-	chunk_t encoding;
-};
-
-METHOD(pb_tnc_msg_t, get_type, pb_tnc_msg_type_t,
-	private_pb_reason_string_msg_t *this)
-{
-	return this->type;
-}
-
-METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
-	private_pb_reason_string_msg_t *this)
-{
-	return this->encoding;
-}
-
-METHOD(pb_tnc_msg_t, build, void,
-	private_pb_reason_string_msg_t *this)
-{
-	bio_writer_t *writer;
-
-	if (this->encoding.ptr)
-	{
-		return;
-	}
-	writer = bio_writer_create(64);
-	writer->write_data32(writer, this->reason_string);
-	writer->write_data8 (writer, this->language_code);
-
-	this->encoding = writer->get_buf(writer);
-	this->encoding = chunk_clone(this->encoding);
-	writer->destroy(writer);
-}
-
-METHOD(pb_tnc_msg_t, process, status_t,
-	private_pb_reason_string_msg_t *this, u_int32_t *offset)
-{
-	bio_reader_t *reader;
-
-	reader = bio_reader_create(this->encoding);
-	if (!reader->read_data32(reader, &this->reason_string))
-	{
-		DBG1(DBG_TNC, "could not parse reason string");
-		reader->destroy(reader);
-		*offset = 0;
-		return FAILED;
-	};
-	this->reason_string = chunk_clone(this->reason_string);
-
-	if (this->reason_string.len &&
-		this->reason_string.ptr[this->reason_string.len-1] == '\0')
-	{
-		DBG1(DBG_TNC, "reason string must not be null terminated");
-		reader->destroy(reader);
-		*offset = 3 + this->reason_string.len;
-		return FAILED;
-	}
-
-	if (!reader->read_data8(reader, &this->language_code))
-	{
-		DBG1(DBG_TNC, "could not parse language code");
-		reader->destroy(reader);
-		*offset = 4 + this->reason_string.len;
-		return FAILED;
-	};
-	this->language_code = chunk_clone(this->language_code);
-	reader->destroy(reader);
-
-	if (this->language_code.len &&
-		this->language_code.ptr[this->language_code.len-1] == '\0')
-	{
-		DBG1(DBG_TNC, "language code must not be null terminated");
-		*offset = 4 + this->reason_string.len + this->language_code.len;
-		return FAILED;
-	}
-
-	return SUCCESS;
-}
-
-METHOD(pb_tnc_msg_t, destroy, void,
-	private_pb_reason_string_msg_t *this)
-{
-	free(this->encoding.ptr);
-	free(this->reason_string.ptr);
-	free(this->language_code.ptr);
-	free(this);
-}
-
-METHOD(pb_reason_string_msg_t, get_reason_string, chunk_t,
-	private_pb_reason_string_msg_t *this)
-{
-	return this->reason_string;
-}
-
-METHOD(pb_reason_string_msg_t, get_language_code, chunk_t,
-	private_pb_reason_string_msg_t *this)
-{
-	return this->language_code;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_reason_string_msg_create_from_data(chunk_t data)
-{
-	private_pb_reason_string_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_reason_string = _get_reason_string,
-			.get_language_code = _get_language_code,
-		},
-		.type = PB_MSG_REASON_STRING,
-		.encoding = chunk_clone(data),
-	);
-
-	return &this->public.pb_interface;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_reason_string_msg_create(chunk_t reason_string,
-										  chunk_t language_code)
-{
-	private_pb_reason_string_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_reason_string = _get_reason_string,
-			.get_language_code = _get_language_code,
-		},
-		.type = PB_MSG_REASON_STRING,
-		.reason_string = chunk_clone(reason_string),
-		.language_code = chunk_clone(language_code),
-	);
-
-	return &this->public.pb_interface;
-}
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.h
deleted file mode 100644
index bb296a90c..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyambuu
- * 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 pb_reason_string_msg pb_reason_string_msg
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_REASON_STRING_MSG_H_
-#define PB_REASON_STRING_MSG_H_
-
-typedef struct pb_reason_string_msg_t pb_reason_string_msg_t;
-
-#include "pb_tnc_msg.h"
-
-/**
- * Class representing the PB-Reason-String message type.
- */
-struct pb_reason_string_msg_t {
-
-	/**
-	 * PB-TNC Message interface
-	 */
-	pb_tnc_msg_t pb_interface;
-
-	/**
-	 * Get Reason String
-	 *
-	 * @return			Reason string
-	 */
-	chunk_t (*get_reason_string)(pb_reason_string_msg_t *this);
-
-	/**
-	 * Get Reason String Language Code
-	 *
-	 * @return			Language code
-	 */
-	chunk_t (*get_language_code)(pb_reason_string_msg_t *this);
-};
-
-/**
- * Create a PB-Reason-String message from parameters
- *
- * @param reason_string		Reason string
-  * @param language_code	Language code
- */
-pb_tnc_msg_t* pb_reason_string_msg_create(chunk_t reason_string,
-										  chunk_t language_code);
-
-/**
- * Create an unprocessed PB-Reason-String message from raw data
- *
-  * @param data		PB-Reason-String message data
- */
-pb_tnc_msg_t* pb_reason_string_msg_create_from_data(chunk_t data);
-
-#endif /** PB_PA_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c
deleted file mode 100644
index 2ef8dd6cd..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c
+++ /dev/null
@@ -1,311 +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.
- */
-
-#include "pb_remediation_parameters_msg.h"
-
-#include <bio/bio_writer.h>
-#include <bio/bio_reader.h>
-#include <utils/debug.h>
-
-ENUM(pb_tnc_remed_param_type_names, PB_REMEDIATION_URI, PB_REMEDIATION_STRING,
-	"Remediation-URI",
-	"Remediation-String"
-);
-
-typedef struct private_pb_remediation_parameters_msg_t private_pb_remediation_parameters_msg_t;
-
-/**
- *   PB-Remediation-Parameters message (see section 4.8 of RFC 5793)
- *
- *      0                   1                   2                   3
- *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |    Reserved   |       Remediation Parameters Vendor ID        |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                  Remediation Parameters Type                  |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |            Remediation Parameters (Variable Length)           |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *     0                   1                   2                   3
- *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                   Remediation String Length                   |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     |                Remediation String (Variable Length)           |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *     | Lang Code Len |  Remediation String Lang Code (Variable Len)  |
- *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-/**
- * Private data of a pb_remediation_parameters_msg_t object.
- *
- */
-struct private_pb_remediation_parameters_msg_t {
-	/**
-	 * Public pb_remediation_parameters_msg_t interface.
-	 */
-	pb_remediation_parameters_msg_t public;
-
-	/**
-	 * PB-TNC message type
-	 */
-	pb_tnc_msg_type_t type;
-
-	/**
-	 * Remediation Parameters Type
-	 */
-	pen_type_t parameters_type;
-
-	/**
-	 * Remediation Parameters
-	 */
-	chunk_t parameters;
-
-	/**
-	 * Remediation String
-	 */
-	chunk_t string;
-
-	/**
-	 * Remediation Language Code
-	 */
-	chunk_t lang_code;
-
-	/**
-	 * Encoded message
-	 */
-	chunk_t encoding;
-};
-
-METHOD(pb_tnc_msg_t, get_type, pb_tnc_msg_type_t,
-	private_pb_remediation_parameters_msg_t *this)
-{
-	return this->type;
-}
-
-METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
-	private_pb_remediation_parameters_msg_t *this)
-{
-	return this->encoding;
-}
-
-METHOD(pb_tnc_msg_t, build, void,
-	private_pb_remediation_parameters_msg_t *this)
-{
-	bio_writer_t *writer;
-
-	if (this->encoding.ptr)
-	{
-		return;
-	}
-	writer = bio_writer_create(64);
-	writer->write_uint32(writer, this->parameters_type.vendor_id);
-	writer->write_uint32(writer, this->parameters_type.type);
-	writer->write_data32(writer, this->parameters);
-
-	this->encoding = writer->get_buf(writer);
-	this->encoding = chunk_clone(this->encoding);
-	writer->destroy(writer);
-}
-
-METHOD(pb_tnc_msg_t, process, status_t,
-	private_pb_remediation_parameters_msg_t *this, u_int32_t *offset)
-{
-	bio_reader_t *reader;
-	u_int8_t reserved;
-	status_t status = SUCCESS;
-	u_char *pos;
-
-	*offset = 0;
-
-	/* process message */
-	reader = bio_reader_create(this->encoding);
-	reader->read_uint8 (reader, &reserved);
-	reader->read_uint24(reader, &this->parameters_type.vendor_id);
-	reader->read_uint32(reader, &this->parameters_type.type);
-	reader->read_data  (reader, reader->remaining(reader), &this->parameters);
-
-	this->parameters = chunk_clone(this->parameters);
-	reader->destroy(reader);
-
-	if (this->parameters_type.vendor_id == PEN_IETF &&
-		this->parameters_type.type == PB_REMEDIATION_STRING)
-	{
-		reader = bio_reader_create(this->parameters);
-		status = FAILED;
-		*offset = 8;
-
-		if (!reader->read_data32(reader, &this->string))
-		{
-			DBG1(DBG_TNC, "insufficient data for remediation string");
-			goto end;
-		};
-		*offset += 4;
-
-		pos = memchr(this->string.ptr, '\0', this->string.len);
-		if (pos)
-		{
-			DBG1(DBG_TNC, "nul termination in remediation string");
-			*offset += (pos - this->string.ptr);
-			goto end;
-		}
-		*offset += this->string.len;
-
-		if (!reader->read_data8(reader, &this->lang_code))
-		{
-			DBG1(DBG_TNC, "insufficient data for remediation string lang code");
-			goto end;
-		};
-		*offset += 1;
-
-		pos = memchr(this->lang_code.ptr, '\0', this->lang_code.len);
-
-		if (pos)
-		{
-			DBG1(DBG_TNC, "nul termination in remediation string lang code");
-			*offset += (pos - this->lang_code.ptr);
-			goto end;
-		}
-		status = SUCCESS;
-
-end:
-		reader->destroy(reader);
-	}
-	return status;
-}
-
-METHOD(pb_tnc_msg_t, destroy, void,
-	private_pb_remediation_parameters_msg_t *this)
-{
-	free(this->encoding.ptr);
-	free(this->parameters.ptr);
-	free(this);
-}
-
-METHOD(pb_remediation_parameters_msg_t, get_parameters_type, pen_type_t,
-	private_pb_remediation_parameters_msg_t *this)
-{
-	return this->parameters_type;
-}
-
-METHOD(pb_remediation_parameters_msg_t, get_parameters, chunk_t,
-	private_pb_remediation_parameters_msg_t *this)
-{
-	return this->parameters;
-}
-
-METHOD(pb_remediation_parameters_msg_t, get_string, chunk_t,
-	private_pb_remediation_parameters_msg_t *this, chunk_t *lang_code)
-{
-	if (lang_code)
-	{
-		*lang_code = this->lang_code;
-	}
-	return this->string;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t* pb_remediation_parameters_msg_create(pen_type_t parameters_type,
-												   chunk_t parameters)
-{
-	private_pb_remediation_parameters_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_parameters_type = _get_parameters_type,
-			.get_parameters = _get_parameters,
-			.get_uri = _get_parameters,
-			.get_string = _get_string,
-		},
-		.type = PB_MSG_REMEDIATION_PARAMETERS,
-		.parameters_type = parameters_type,
-		.parameters = chunk_clone(parameters),
-	);
-
-	return &this->public.pb_interface;
-}
-
-/**
- * Described in header.
- */
-pb_tnc_msg_t* pb_remediation_parameters_msg_create_from_uri(chunk_t uri)
-{
-	pen_type_t type = { PEN_IETF, PB_REMEDIATION_URI };
-
-	return pb_remediation_parameters_msg_create(type, uri);
-}
-
-/**
- * Described in header.
- */
-pb_tnc_msg_t* pb_remediation_parameters_msg_create_from_string(chunk_t string,
-															   chunk_t lang_code)
-{
-	pb_tnc_msg_t *msg;
-	bio_writer_t *writer;
-	pen_type_t type = { PEN_IETF, PB_REMEDIATION_STRING };
-
-	/* limit language code to 255 octets */
-	lang_code.len = min(255, lang_code.len);
-
-	writer = bio_writer_create(4 + string.len + 1 + lang_code.len);
-	writer->write_data32(writer, string);
-	writer->write_data8 (writer, lang_code);
-
-	msg = pb_remediation_parameters_msg_create(type, writer->get_buf(writer));
-	writer->destroy(writer);
-
-	return msg;
-}
-
-/**
- * See header
- */
-pb_tnc_msg_t *pb_remediation_parameters_msg_create_from_data(chunk_t data)
-{
-	private_pb_remediation_parameters_msg_t *this;
-
-	INIT(this,
-		.public = {
-			.pb_interface = {
-				.get_type = _get_type,
-				.get_encoding = _get_encoding,
-				.build = _build,
-				.process = _process,
-				.destroy = _destroy,
-			},
-			.get_parameters_type = _get_parameters_type,
-			.get_parameters = _get_parameters,
-			.get_uri = _get_parameters,
-			.get_string = _get_string,
-		},
-		.type = PB_MSG_REMEDIATION_PARAMETERS,
-		.encoding = chunk_clone(data),
-	);
-
-	return &this->public.pb_interface;
-}
-
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h
deleted file mode 100644
index f3a1c1009..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2011-2013 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 pb_remediation_parameters_msg pb_remediation_parameters_msg
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_REMEDIATION_PARAMETERS_MSG_H_
-#define PB_REMEDIATION_PARAMETERS_MSG_H_
-
-typedef enum pb_tnc_remed_param_type_t pb_tnc_remed_param_type_t;
-typedef struct pb_remediation_parameters_msg_t pb_remediation_parameters_msg_t;
-
-#include "pb_tnc_msg.h"
-
-#include <pen/pen.h>
-
-/**
- * PB-TNC Remediation Parameter Types as defined in section 4.8.1 of RFC 5793
- */
-enum pb_tnc_remed_param_type_t {
-	PB_REMEDIATION_URI =			1,
-	PB_REMEDIATION_STRING =			2,
-};
-
-/**
- * enum name for pb_tnc_remed_param_type_t.
- */
-extern enum_name_t *pb_tnc_remed_param_type_names;
-
-/**
- * Class representing the PB-Remediation-Parameters message type.
- */
-struct pb_remediation_parameters_msg_t {
-
-	/**
-	 * PB-TNC Message interface
-	 */
-	pb_tnc_msg_t pb_interface;
-
-	/**
-	 * Get the Remediation Parameters Type (Vendor ID and Type)
-	 *
-	 * @return				Remediation Parameters Type
-	 */
-	pen_type_t (*get_parameters_type)(pb_remediation_parameters_msg_t *this);
-
-	/**
-	 * Get the Remediation Parameters
-	 *
-	 * @return				Remediation Parameters
-	 */
-	chunk_t (*get_parameters)(pb_remediation_parameters_msg_t *this);
-
-	/**
-	 * Get the Remediation URI
-	 *
-	 * @return				Remediation URI
-	 */
-	chunk_t (*get_uri)(pb_remediation_parameters_msg_t *this);
-
-	/**
-	 * Get the Remediation String
-	 *
-	 * @param lang_code		Optional Language Code
-	 * @return				Remediation String
-	 */
-	chunk_t (*get_string)(pb_remediation_parameters_msg_t *this,
-						  chunk_t *lang_code);
-
-};
-
-/**
- * Create a general PB-Remediation-Parameters message
- *
- * @param parameters_type	Remediation Parameters Type
- * @param parameters		Remediation Parameters
- */
-pb_tnc_msg_t* pb_remediation_parameters_msg_create(pen_type_t parameters_type,
-												   chunk_t parameters);
-
-/**
- * Create a PB-Remediation-Parameters message of IETF Type Remediation URI
- *
- * @param uri				Remediation URI
- */
-pb_tnc_msg_t* pb_remediation_parameters_msg_create_from_uri(chunk_t uri);
-
-/**
- * Create a PB-Remediation-Parameters message of IETF Type Remediation String
- *
- * @param string			Remediation String
- * @param lang_code			Remediation String Language Code
- */
-pb_tnc_msg_t* pb_remediation_parameters_msg_create_from_string(chunk_t string,
-															   chunk_t lang_code);
-
-/**
- * Create an unprocessed PB-Remediation-Parameters message from raw data
- *
-  * @param data		PB-Remediation-Parameters message data
- */
-pb_tnc_msg_t* pb_remediation_parameters_msg_create_from_data(chunk_t data);
-
-#endif /** PB_PA_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.c b/src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.c
deleted file mode 100644
index 3565c2d84..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.c
+++ /dev/null
@@ -1,75 +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.
- */
-
-#include "pb_tnc_msg.h"
-#include "pb_experimental_msg.h"
-#include "pb_pa_msg.h"
-#include "pb_error_msg.h"
-#include "pb_language_preference_msg.h"
-#include "pb_assessment_result_msg.h"
-#include "pb_access_recommendation_msg.h"
-#include "pb_remediation_parameters_msg.h"
-#include "pb_reason_string_msg.h"
-
-#include <library.h>
-
-ENUM(pb_tnc_msg_type_names, PB_MSG_EXPERIMENTAL, PB_MSG_REASON_STRING,
-	"PB-Experimental",
-	"PB-PA",
-	"PB-Assessment-Result",
-	"PB-Access-Recommendation",
-	"PB-Remediation-Parameters",
-	"PB-Error",
-	"PB-Language-Preference",
-	"PB-Reason-String"
-);
-
-pb_tnc_msg_info_t pb_tnc_msg_infos[] = {
-	{ 12, FALSE, FALSE, TRUE_OR_FALSE },
-	{ 24, FALSE, FALSE, TRUE  },
-	{ 16, TRUE,  TRUE,  TRUE  },
-	{ 16, TRUE,  TRUE,  FALSE },
-	{ 20, FALSE, TRUE,  FALSE },
-	{ 20, FALSE, FALSE, TRUE  },
-	{ 12, FALSE, FALSE, FALSE },
-	{ 17, FALSE, TRUE,  FALSE },
-};
-
-/**
- * See header
- */
-pb_tnc_msg_t* pb_tnc_msg_create_from_data(pb_tnc_msg_type_t type, chunk_t value)
-{
-	switch (type)
-	{
-		case PB_MSG_PA:
-			return pb_pa_msg_create_from_data(value);
-		case PB_MSG_ERROR:
-			return pb_error_msg_create_from_data(value);
-		case PB_MSG_EXPERIMENTAL:
-			return pb_experimental_msg_create_from_data(value);
-		case PB_MSG_LANGUAGE_PREFERENCE:
-			return pb_language_preference_msg_create_from_data(value);
-		case PB_MSG_ASSESSMENT_RESULT:
-			return pb_assessment_result_msg_create_from_data(value);
-		case PB_MSG_ACCESS_RECOMMENDATION:
-			return pb_access_recommendation_msg_create_from_data(value);
-		case PB_MSG_REMEDIATION_PARAMETERS:
-			return pb_remediation_parameters_msg_create_from_data(value);
-		case PB_MSG_REASON_STRING:
-			return pb_reason_string_msg_create_from_data(value);
-	}
-	return NULL;
-}
diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.h b/src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.h
deleted file mode 100644
index 97ebed27f..000000000
--- a/src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.h
+++ /dev/null
@@ -1,128 +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 pb_tnc_msg pb_tnc_msg
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_TNC_MSG_H_
-#define PB_TNC_MSG_H_
-
-typedef enum pb_tnc_msg_type_t pb_tnc_msg_type_t;
-typedef struct pb_tnc_msg_info_t pb_tnc_msg_info_t;
-typedef struct pb_tnc_msg_t pb_tnc_msg_t;
-
-#include <library.h>
-
-#define PB_TNC_VERSION		2
-
-/**
- * PB-TNC Message Types as defined in section 4.3 of RFC 5793
- */
-enum pb_tnc_msg_type_t {
-	PB_MSG_EXPERIMENTAL =				0,
-	PB_MSG_PA =							1,
-	PB_MSG_ASSESSMENT_RESULT =			2,
-	PB_MSG_ACCESS_RECOMMENDATION =		3,
-	PB_MSG_REMEDIATION_PARAMETERS =		4,
-	PB_MSG_ERROR =						5,
-	PB_MSG_LANGUAGE_PREFERENCE =		6,
-	PB_MSG_REASON_STRING =				7,
-	PB_MSG_ROOF =						7
-};
-
-/**
- * enum name for pb_tnc_msg_type_t.
- */
-extern enum_name_t *pb_tnc_msg_type_names;
-
-/**
- * Information entry describing a PB-TNC Message Type
- */
-struct pb_tnc_msg_info_t {
-	u_int32_t min_size;
-	bool exact_size;
-	bool in_result_batch;
-	signed char has_noskip_flag;
-};
-
-#define	TRUE_OR_FALSE	2
-
-/**
- * Information on PB-TNC Message Types
- */
-extern pb_tnc_msg_info_t pb_tnc_msg_infos[];
-
-/**
- * Generic interface for all PB-TNC message types.
- *
- * To handle all messages in a generic way, this interface
- * must be implemented by each message type.
- */
-struct pb_tnc_msg_t {
-
-	/**
-	 * Get the PB-TNC Message Type
-	 *
-	 * @return					 PB-TNC Message Type
-	 */
-	pb_tnc_msg_type_t (*get_type)(pb_tnc_msg_t *this);
-
-	/**
-	 * Get the encoding of the PB-TNC Message Value
-	 *
-	 * @return					encoded PB-TNC Message Value
-	 */
-	chunk_t (*get_encoding)(pb_tnc_msg_t *this);
-
-	/**
-	 * Build the PB-TNC Message Value
-	 */
-	void (*build)(pb_tnc_msg_t *this);
-
-	/**
-	 * Process the PB-TNC Message Value
-	 *
-	 * @param					relative offset where an error occurred
-	 * @return					return processing status
-	 */
-	status_t (*process)(pb_tnc_msg_t *this, u_int32_t *offset);
-
-	/**
-	 * Get a new reference to the message.
-	 *
-	 * @return			this, with an increased refcount
-	 */
-	pb_tnc_msg_t* (*get_ref)(pb_tnc_msg_t *this);
-
-	/**
-	 * Destroys a pb_tnc_msg_t object.
-	 */
-	void (*destroy)(pb_tnc_msg_t *this);
-};
-
-/**
- * Create an unprocessed PB-TNC message
- *
- * Useful for the parser which wants a generic constructor for all
- * pb_tnc_message_t types.
- *
- * @param type		PB-TNC message type
- * @param value		PB-TNC message value
- */
-pb_tnc_msg_t* pb_tnc_msg_create_from_data(pb_tnc_msg_type_t type, chunk_t value);
-
-#endif /** PB_TNC_MSG_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c b/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c
deleted file mode 100644
index 43f185440..000000000
--- a/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c
+++ /dev/null
@@ -1,316 +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.
- */
-
-#include "pb_tnc_state_machine.h"
-
-#include <utils/debug.h>
-
-ENUM(pb_tnc_state_names, PB_STATE_INIT, PB_STATE_END,
-	"Init",
-	"Server Working",
-	"Client Working",
-	"Decided",
-	"End"
-);
-
-/**
- *   PB-TNC State Machine (see section 3.2 of RFC 5793)
- *
- *              Receive CRETRY        SRETRY
- *                   or SRETRY   +----------------+
- *                        +--+   |                |
- *                        v  |   v                |
- *                       +---------+  CRETRY  +---------+
- *             CDATA     | Server  |<---------| Decided | CLOSE
- *          +----------->| Working |--------->|         |-------+
- *          |            +---------+  RESULT  +---------+       |
- *          |                ^ |  |                             v
- *          |                | |  +---------------------->=======
- *        ========           | |              CLOSE       " End "
- *        " Init "      CDATA| |SDATA                     =======
- *        ========           | |                          ^    ^
- *          |  |             | v                          |    |
- *          |  | SDATA   +---------+          CLOSE       |    |
- *          |  +-------->| Client  |----------------------+    |
- *          |            | Working |                           |
- *          |            +---------+                           |
- *          |                |  ^                              |
- *          |                +--+                              |
- *          |            Receive CRETRY                        |
- *          |   CLOSE                                          |
- *          +--------------------------------------------------+
- */
-
-typedef struct private_pb_tnc_state_machine_t private_pb_tnc_state_machine_t;
-
-/**
- * Private data of a pb_tnc_state_machine_t object.
- *
- */
-struct private_pb_tnc_state_machine_t {
-	/**
-	 * Public pb_pa_message_t interface.
-	 */
-	pb_tnc_state_machine_t public;
-
-	/**
-	 * PB-TNC Server if TRUE, PB-TNC Client if FALSE
-	 */
-	bool is_server;
-
-	/**
-	 * Informs whether last received PB-TNC CDATA Batch was empty
-	 */
-	bool empty_cdata;
-
-	/**
-	 * Current PB-TNC state
-	 */
-	pb_tnc_state_t state;
-};
-
-METHOD(pb_tnc_state_machine_t, get_state, pb_tnc_state_t,
-	private_pb_tnc_state_machine_t *this)
-{
-	return this->state;
-}
-
-METHOD(pb_tnc_state_machine_t, receive_batch, bool,
-	private_pb_tnc_state_machine_t *this, pb_tnc_batch_type_t type)
-{
-	pb_tnc_state_t old_state = this->state;
-
-	switch (this->state)
-	{
-		case PB_STATE_INIT:
-			if (this->is_server && type == PB_BATCH_CDATA)
-			{
-				this->state = PB_STATE_SERVER_WORKING;
-				break;
-			}
-			if (!this->is_server && type == PB_BATCH_SDATA)
-			{
-				this->state = PB_STATE_CLIENT_WORKING;
-				break;
-			}
-			if (type == PB_BATCH_CLOSE)
-			{
-				this->state = PB_STATE_END;
-				break;
-			}
-			return FALSE;
-		case PB_STATE_SERVER_WORKING:
-			if (!this->is_server && (type == PB_BATCH_SDATA ||
-									 type == PB_BATCH_SRETRY))
-			{
-				this->state = PB_STATE_CLIENT_WORKING;
-				break;
-			}
-			if (!this->is_server && type == PB_BATCH_RESULT)
-			{
-				this->state = PB_STATE_DECIDED;
-				break;
-			}
-			if (this->is_server && type == PB_BATCH_CRETRY)
-			{
-				break;
-			}
-			if (type == PB_BATCH_CLOSE)
-			{
-				this->state = PB_STATE_END;
-				break;
-			}
-			return FALSE;
-		case PB_STATE_CLIENT_WORKING:
-			if (this->is_server && type == PB_BATCH_CDATA)
-			{
-				this->state = PB_STATE_SERVER_WORKING;
-				break;
-			}
-			if (this->is_server && type == PB_BATCH_CRETRY)
-			{
-				break;
-			}
-			if (type == PB_BATCH_CLOSE)
-			{
-				this->state = PB_STATE_END;
-				break;
-			}
-			return FALSE;
-		case PB_STATE_DECIDED:
-			if ((this->is_server && type == PB_BATCH_CRETRY) ||
-			   (!this->is_server && type == PB_BATCH_SRETRY))
-			{
-				this->state = PB_STATE_SERVER_WORKING;
-				break;
-			}
-			if (type == PB_BATCH_CLOSE)
-			{
-				this->state = PB_STATE_END;
-				break;
-			}
-			return FALSE;
-		case PB_STATE_END:
-			if (type == PB_BATCH_CLOSE)
-			{
-				break;
-			}
-			return FALSE;
-	}
-
-	if (this->state != old_state)
-	{
-		DBG2(DBG_TNC, "PB-TNC state transition from '%N' to '%N'",
-			 pb_tnc_state_names, old_state, pb_tnc_state_names, this->state);
-	}
-	return TRUE;
-}
-
-METHOD(pb_tnc_state_machine_t, send_batch, bool,
-	private_pb_tnc_state_machine_t *this, pb_tnc_batch_type_t type)
-{
-	pb_tnc_state_t old_state = this->state;
-
-	switch (this->state)
-	{
-		case PB_STATE_INIT:
-			if (!this->is_server && type == PB_BATCH_CDATA)
-			{
-				this->state = PB_STATE_SERVER_WORKING;
-				break;
-			}
-			if (this->is_server && type == PB_BATCH_SDATA)
-			{
-				this->state = PB_STATE_CLIENT_WORKING;
-				break;
-			}
-			if (type == PB_BATCH_CLOSE)
-			{
-				this->state = PB_STATE_END;
-				break;
-			}
-			return FALSE;
-		case PB_STATE_SERVER_WORKING:
-			if (this->is_server && (type == PB_BATCH_SDATA ||
-									type == PB_BATCH_SRETRY))
-			{
-				this->state = PB_STATE_CLIENT_WORKING;
-				break;
-			}
-			if (this->is_server && type == PB_BATCH_RESULT)
-			{
-				this->state = PB_STATE_DECIDED;
-				break;
-			}
-			if (!this->is_server && type == PB_BATCH_CRETRY)
-			{
-				break;
-			}
-			if (type == PB_BATCH_CLOSE)
-			{
-				this->state = PB_STATE_END;
-				break;
-			}
-			return FALSE;
-		case PB_STATE_CLIENT_WORKING:
-			if (!this->is_server && (type == PB_BATCH_CDATA ||
-									 type == PB_BATCH_CRETRY))
-			{
-				this->state = PB_STATE_SERVER_WORKING;
-				break;
-			}
-			if (this->is_server && type == PB_BATCH_SRETRY)
-			{
-				break;
-			}
-			if (type == PB_BATCH_CLOSE)
-			{
-				this->state = PB_STATE_END;
-				break;
-			}
-			return FALSE;
-		case PB_STATE_DECIDED:
-			if ((this->is_server && type == PB_BATCH_SRETRY) ||
-			   (!this->is_server && type == PB_BATCH_CRETRY))
-			{
-				this->state = PB_STATE_SERVER_WORKING;
-				break;
-			}
-			if (type == PB_BATCH_CLOSE)
-			{
-				this->state = PB_STATE_END;
-				break;
-			}
-			return FALSE;
-		case PB_STATE_END:
-			if (type == PB_BATCH_CLOSE)
-			{
-				break;
-			}
-			return FALSE;
-	}
-
-	if (this->state != old_state)
-	{
-		DBG2(DBG_TNC, "PB-TNC state transition from '%N' to '%N'",
-			 pb_tnc_state_names, old_state, pb_tnc_state_names, this->state);
-	}
-	return TRUE;
-}
-
-METHOD(pb_tnc_state_machine_t, get_empty_cdata, bool,
-	private_pb_tnc_state_machine_t *this)
-{
-	return this->empty_cdata;
-}
-
-METHOD(pb_tnc_state_machine_t, set_empty_cdata, void,
-	private_pb_tnc_state_machine_t *this, bool empty)
-{
-	if (empty)
-	{
-		DBG2(DBG_TNC, "received empty PB-TNC CDATA batch");
-	}
-	this->empty_cdata = empty;
-}
-
-METHOD(pb_tnc_state_machine_t, destroy, void,
-	private_pb_tnc_state_machine_t *this)
-{
-	free(this);
-}
-
-/**
- * See header
- */
-pb_tnc_state_machine_t* pb_tnc_state_machine_create(bool is_server)
-{
-	private_pb_tnc_state_machine_t *this;
-
-	INIT(this,
-		.public = {
-			.get_state = _get_state,
-			.receive_batch = _receive_batch,
-			.send_batch = _send_batch,
-			.get_empty_cdata = _get_empty_cdata,
-			.set_empty_cdata = _set_empty_cdata,
-			.destroy = _destroy,
-		},
-		.is_server = is_server,
-		.state = PB_STATE_INIT,
-	);
-
-	return &this->public;
-}
diff --git a/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h b/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h
deleted file mode 100644
index aa317041e..000000000
--- a/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h
+++ /dev/null
@@ -1,102 +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 pb_tnc_state_machine pb_tnc_state_machine
- * @{ @ingroup tnccs_20
- */
-
-#ifndef PB_TNC_STATE_MACHINE_H_
-#define PB_TNC_STATE_MACHINE_H_
-
-typedef struct pb_tnc_state_machine_t pb_tnc_state_machine_t;
-typedef enum pb_tnc_state_t pb_tnc_state_t;
-
-#include "batch/pb_tnc_batch.h"
-
-#include <library.h>
-
-/**
- * PB-TNC States (state machine) as defined in section 3.2 of RFC 5793
- */
-enum pb_tnc_state_t {
-	PB_STATE_INIT,
-	PB_STATE_SERVER_WORKING,
-	PB_STATE_CLIENT_WORKING,
-	PB_STATE_DECIDED,
-	PB_STATE_END,
-};
-
-/**
- * enum name for pb_tnc_state_t.
- */
-extern enum_name_t *pb_tnc_state_names;
-
-/**
- * Interface for the PB-TNC state machine.
- */
-struct pb_tnc_state_machine_t {
-
-	/**
-	 * Get the current PB-TNC STATE
-	 *
-	 * @return				current state
-	 */
-	pb_tnc_state_t (*get_state)(pb_tnc_state_machine_t *this);
-
-	/**
-	 * Compute state transition due to received PB-TNC Batch
-	 *
-	 * @param type			type of received batch
-	 * @result				TRUE if a valid transition was found, FALSE otherwise
-	 */
-	bool (*receive_batch)(pb_tnc_state_machine_t *this, pb_tnc_batch_type_t type);
-
-	/**
-	 * Compute state transition due to sent PB-TNC Batch
-	 *
-	 * @param type			type of sent batch
-	 * @result				TRUE if a valid transition was found, FALSE otherwise
-	 */
-	bool (*send_batch)(pb_tnc_state_machine_t *this, pb_tnc_batch_type_t type);
-
-	/**
-	 * Informs whether the last received PB-TNC CDATA Batch was empty
-	 *
-	 * @result				TRUE if last received PB-TNC CDATA Batch was empty
-	 */
-	bool (*get_empty_cdata)(pb_tnc_state_machine_t *this);
-
-	/**
-	 * Store information whether the received PB-TNC CDATA Batch was empty
-	 *
-	 * @param empty			set to TRUE if received PB-TNC CDATA Batch was empty
-	 */
-	void (*set_empty_cdata)(pb_tnc_state_machine_t *this, bool empty);
-
-	/**
-	 * Destroys a pb_tnc_state_machine_t object.
-	 */
-	void (*destroy)(pb_tnc_state_machine_t *this);
-};
-
-/**
- * Create and initialize a PB-TNC state machine
- *
- * @param is_server		TRUE if PB-TNC server, FALSE if PB-TNC client
- */
-pb_tnc_state_machine_t* pb_tnc_state_machine_create(bool is_server);
-
-#endif /** PB_TNC_STATE_MACHINE_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.c b/src/libcharon/plugins/tnccs_20/tnccs_20.c
deleted file mode 100644
index 4c8f3a925..000000000
--- a/src/libcharon/plugins/tnccs_20/tnccs_20.c
+++ /dev/null
@@ -1,944 +0,0 @@
-/*
- * Copyright (C) 2010 Sansar Choinyanbuu
- * Copyright (C) 2010-2013 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 "tnccs_20.h"
-#include "batch/pb_tnc_batch.h"
-#include "messages/pb_tnc_msg.h"
-#include "messages/pb_pa_msg.h"
-#include "messages/pb_error_msg.h"
-#include "messages/pb_assessment_result_msg.h"
-#include "messages/pb_access_recommendation_msg.h"
-#include "messages/pb_remediation_parameters_msg.h"
-#include "messages/pb_reason_string_msg.h"
-#include "messages/pb_language_preference_msg.h"
-#include "state_machine/pb_tnc_state_machine.h"
-
-#include <tncif_names.h>
-#include <tncif_pa_subtypes.h>
-
-#include <tnc/tnc.h>
-#include <tnc/tnccs/tnccs_manager.h>
-#include <tnc/imc/imc_manager.h>
-#include <tnc/imv/imv_manager.h>
-
-#include <utils/debug.h>
-#include <daemon.h>
-#include <threading/mutex.h>
-#include <collections/linked_list.h>
-#include <pen/pen.h>
-
-typedef struct private_tnccs_20_t private_tnccs_20_t;
-
-/**
- * Private data of a tnccs_20_t object.
- */
-struct private_tnccs_20_t {
-
-	/**
-	 * Public tnccs_t interface.
-	 */
-	tnccs_t public;
-
-	/**
-	 * TNCC if TRUE, TNCS if FALSE
-	 */
-	bool is_server;
-
-	/**
-	 * Server identity
-	 */
-	identification_t *server;
-
-	/**
-	 * Client identity
-	 */
-	identification_t *peer;
-
-	/**
-	 * Underlying TNC IF-T transport protocol
-	 */
-	tnc_ift_type_t transport;
-
-	/**
-	 * Type of TNC client authentication
-	 */
-	u_int32_t auth_type;
-
-	/**
-	 * PB-TNC State Machine
-	 */
-	pb_tnc_state_machine_t *state_machine;
-
-	/**
-	 * Connection ID assigned to this TNCCS connection
-	 */
-	TNC_ConnectionID connection_id;
-
-	/**
-	 * PB-TNC messages to be sent
-	 */
-	linked_list_t *messages;
-
-	/**
-	 * Type of PB-TNC batch being constructed
-	 */
-	pb_tnc_batch_type_t batch_type;
-
-	/**
-	 * Maximum PB-TNC batch size
-	 */
-	size_t max_batch_len;
-
-	/**
-	 * Maximum PA-TNC message size
-	 */
-	size_t max_msg_len;
-
-	/**
-	 * Mutex locking the batch in construction
-	 */
-	mutex_t *mutex;
-
-	/**
-	 * Flag set while processing
-	 */
-	bool fatal_error;
-
-	/**
-	 * Flag set by IMC/IMV RequestHandshakeRetry() function
-	 */
-	bool request_handshake_retry;
-
-	/**
-	  * SendMessage() by IMC/IMV only allowed if flag is set
-	  */
-	bool send_msg;
-
-	/**
-	 * Set of IMV recommendations  (TNC Server only)
-	 */
-	recommendations_t *recs;
-
-};
-
-/**
- * If the batch type changes then delete all accumulated PB-TNC messages
- */
-void change_batch_type(private_tnccs_20_t *this, pb_tnc_batch_type_t batch_type)
-{
-	pb_tnc_msg_t *msg;
-
-	if (batch_type != this->batch_type)
-	{
-		if (this->batch_type != PB_BATCH_NONE)
-		{
-			DBG1(DBG_TNC, "cancelling PB-TNC %N batch",
-				 pb_tnc_batch_type_names, this->batch_type);
-
-			while (this->messages->remove_last(this->messages,
-											  (void**)&msg) == SUCCESS)
-			{
-				msg->destroy(msg);
-			}
-		}
-		this->batch_type = batch_type;
-	}
-}
-
-METHOD(tnccs_t, send_msg, TNC_Result,
-	private_tnccs_20_t* this, TNC_IMCID imc_id, TNC_IMVID imv_id,
-						      TNC_UInt32 msg_flags,
-							  TNC_BufferReference msg,
-							  TNC_UInt32 msg_len,
-						      TNC_VendorID msg_vid,
-						      TNC_MessageSubtype msg_subtype)
-{
-	pb_tnc_msg_t *pb_tnc_msg;
-	pb_tnc_batch_type_t batch_type;
-	enum_name_t *pa_subtype_names;
-	bool excl;
-
-	if (!this->send_msg)
-	{
-		DBG1(DBG_TNC, "%s %u not allowed to call SendMessage()",
-			this->is_server ? "IMV" : "IMC",
-			this->is_server ? imv_id : imc_id);
-		return TNC_RESULT_ILLEGAL_OPERATION;
-	}
-	excl = (msg_flags & TNC_MESSAGE_FLAGS_EXCLUSIVE) != 0;
-
-	pb_tnc_msg = pb_pa_msg_create(msg_vid, msg_subtype, imc_id, imv_id,
-								  excl, chunk_create(msg, msg_len));
-
-	pa_subtype_names = get_pa_subtype_names(msg_vid);
-	if (pa_subtype_names)
-	{
-		DBG2(DBG_TNC, "creating PB-PA message type '%N/%N' 0x%06x/0x%08x",
-					   pen_names, msg_vid, pa_subtype_names, msg_subtype,
-					   msg_vid, msg_subtype);
-	}
-	else
-	{
-		DBG2(DBG_TNC, "creating PB-PA message type '%N' 0x%06x/0x%08x",
-					   pen_names, msg_vid, msg_vid, msg_subtype);
-	}
-
-	/* adding PA message to SDATA or CDATA batch only */
-	batch_type = this->is_server ? PB_BATCH_SDATA : PB_BATCH_CDATA;
-	this->mutex->lock(this->mutex);
-	if (this->batch_type == PB_BATCH_NONE)
-	{
-		this->batch_type = batch_type;
-	}
-	if (this->batch_type == batch_type)
-	{
-		this->messages->insert_last(this->messages, pb_tnc_msg);
-	}
-	else
-	{
-		pb_tnc_msg->destroy(pb_tnc_msg);
-	}
-	this->mutex->unlock(this->mutex);
-	return TNC_RESULT_SUCCESS;
-}
-
-/**
- * Handle a single PB-TNC message according to its type
- */
-static void handle_message(private_tnccs_20_t *this, pb_tnc_msg_t *msg)
-{
-	switch (msg->get_type(msg))
-	{
-		case PB_MSG_EXPERIMENTAL:
-			/* nothing to do */
-			break;
-		case PB_MSG_PA:
-		{
-			pb_pa_msg_t *pa_msg;
-			pen_type_t msg_subtype;
-			u_int16_t imc_id, imv_id;
-			chunk_t msg_body;
-			bool excl;
-			enum_name_t *pa_subtype_names;
-
-			pa_msg = (pb_pa_msg_t*)msg;
-			msg_subtype = pa_msg->get_subtype(pa_msg);
-			msg_body = pa_msg->get_body(pa_msg);
-			imc_id = pa_msg->get_collector_id(pa_msg);
-			imv_id = pa_msg->get_validator_id(pa_msg);
-			excl = pa_msg->get_exclusive_flag(pa_msg);
-
-			pa_subtype_names = get_pa_subtype_names(msg_subtype.vendor_id);
-			if (pa_subtype_names)
-			{
-				DBG2(DBG_TNC, "handling PB-PA message type '%N/%N' 0x%06x/0x%08x",
-					 pen_names, msg_subtype.vendor_id, pa_subtype_names,
-					 msg_subtype.type, msg_subtype.vendor_id, msg_subtype.type);
-			}
-			else
-			{
-				DBG2(DBG_TNC, "handling PB-PA message type '%N' 0x%06x/0x%08x",
-					 pen_names, msg_subtype.vendor_id, msg_subtype.vendor_id,
-					 msg_subtype.type);
-			}
-
-			this->send_msg = TRUE;
-			if (this->is_server)
-			{
-				tnc->imvs->receive_message(tnc->imvs, this->connection_id,
-										   excl, msg_body.ptr, msg_body.len,
-										   msg_subtype.vendor_id,
-										   msg_subtype.type, imc_id, imv_id);
-			}
-			else
-			{
-				tnc->imcs->receive_message(tnc->imcs, this->connection_id,
-										   excl, msg_body.ptr, msg_body.len,
-										   msg_subtype.vendor_id,
-										   msg_subtype.type, imv_id, imc_id);
-			}
-			this->send_msg = FALSE;
-			break;
-		}
-		case PB_MSG_ASSESSMENT_RESULT:
-		{
-			pb_assessment_result_msg_t *assess_msg;
-			u_int32_t result;
-
-			assess_msg = (pb_assessment_result_msg_t*)msg;
-			result = assess_msg->get_assessment_result(assess_msg);
-			DBG1(DBG_TNC, "PB-TNC assessment result is '%N'",
-				 TNC_IMV_Evaluation_Result_names, result);
-			break;
-		}
-		case PB_MSG_ACCESS_RECOMMENDATION:
-		{
-			pb_access_recommendation_msg_t *rec_msg;
-			pb_access_recommendation_code_t rec;
-			TNC_ConnectionState state = TNC_CONNECTION_STATE_ACCESS_NONE;
-
-			rec_msg = (pb_access_recommendation_msg_t*)msg;
-			rec = rec_msg->get_access_recommendation(rec_msg);
-			DBG1(DBG_TNC, "PB-TNC access recommendation is '%N'",
-						   pb_access_recommendation_code_names, rec);
-			switch (rec)
-			{
-				case PB_REC_ACCESS_ALLOWED:
-					state = TNC_CONNECTION_STATE_ACCESS_ALLOWED;
-					break;
-				case PB_REC_ACCESS_DENIED:
-					state = TNC_CONNECTION_STATE_ACCESS_NONE;
-					break;
-				case PB_REC_QUARANTINED:
-					state = TNC_CONNECTION_STATE_ACCESS_ISOLATED;
-			}
-			tnc->imcs->notify_connection_change(tnc->imcs, this->connection_id,
-												state);
-			break;
-		}
-		case PB_MSG_REMEDIATION_PARAMETERS:
-		{
-			pb_remediation_parameters_msg_t *rem_msg;
-			pen_type_t parameters_type;
-			chunk_t parameters, string, lang_code;
-
-			rem_msg = (pb_remediation_parameters_msg_t*)msg;
-			parameters_type = rem_msg->get_parameters_type(rem_msg);
-			parameters = rem_msg->get_parameters(rem_msg);
-
-			if (parameters_type.vendor_id == PEN_IETF)
-			{
-				switch (parameters_type.type)
-				{
-					case PB_REMEDIATION_URI:
-						DBG1(DBG_TNC, "remediation uri: %.*s",
-									   parameters.len, parameters.ptr);
-						break;
-					case PB_REMEDIATION_STRING:
-						string = rem_msg->get_string(rem_msg, &lang_code);
-						DBG1(DBG_TNC, "remediation string: [%.*s]\n%.*s",
-									   lang_code.len, lang_code.ptr,
-									   string.len, string.ptr);
-						break;
-					default:
-						DBG1(DBG_TNC, "remediation parameters: %B", &parameters);
-				}
-			}
-			else
-			{
-				DBG1(DBG_TNC, "remediation parameters: %B", &parameters);
-			}
-			break;
-		}
-		case PB_MSG_ERROR:
-		{
-			pb_error_msg_t *err_msg;
-			bool fatal;
-			u_int32_t vendor_id;
-			u_int16_t error_code;
-
-			err_msg = (pb_error_msg_t*)msg;
-			fatal = err_msg->get_fatal_flag(err_msg);
-			vendor_id = err_msg->get_vendor_id(err_msg);
-			error_code = err_msg->get_error_code(err_msg);
-
-			if (fatal)
-			{
-				this->fatal_error = TRUE;
-			}
-
-			if (vendor_id == PEN_IETF)
-			{
-				switch (error_code)
-				{
-					case PB_ERROR_INVALID_PARAMETER:
-					case PB_ERROR_UNSUPPORTED_MANDATORY_MSG:
-						DBG1(DBG_TNC, "received %s PB-TNC error '%N' "
-									  "(offset %u bytes)",
-									  fatal ? "fatal" : "non-fatal",
-									  pb_tnc_error_code_names, error_code,
-									  err_msg->get_offset(err_msg));
-						break;
-					case PB_ERROR_VERSION_NOT_SUPPORTED:
-						DBG1(DBG_TNC, "received %s PB-TNC error '%N' "
-									  "caused by bad version 0x%02x",
-									  fatal ? "fatal" : "non-fatal",
-									  pb_tnc_error_code_names, error_code,
-									  err_msg->get_bad_version(err_msg));
-						break;
-					case PB_ERROR_UNEXPECTED_BATCH_TYPE:
-					case PB_ERROR_LOCAL_ERROR:
-					default:
-						DBG1(DBG_TNC, "received %s PB-TNC error '%N'",
-									  fatal ? "fatal" : "non-fatal",
-									  pb_tnc_error_code_names, error_code);
-						break;
-				}
-			}
-			else
-			{
-				DBG1(DBG_TNC, "received %s PB-TNC error (%u) "
-							  "with Vendor ID 0x%06x",
-							  fatal ? "fatal" : "non-fatal",
-							  error_code, vendor_id);
-			}
-			break;
-		}
-		case PB_MSG_LANGUAGE_PREFERENCE:
-		{
-			pb_language_preference_msg_t *lang_msg;
-			chunk_t lang;
-
-			lang_msg = (pb_language_preference_msg_t*)msg;
-			lang = lang_msg->get_language_preference(lang_msg);
-
-			if (this->recs)
-			{
-				DBG2(DBG_TNC, "setting language preference to '%.*s'",
-					 (int)lang.len, lang.ptr);
-				this->recs->set_preferred_language(this->recs, lang);
-			}
-			break;
-		}
-		case PB_MSG_REASON_STRING:
-		{
-			pb_reason_string_msg_t *reason_msg;
-			chunk_t reason_string, language_code;
-
-			reason_msg = (pb_reason_string_msg_t*)msg;
-			reason_string = reason_msg->get_reason_string(reason_msg);
-			language_code = reason_msg->get_language_code(reason_msg);
-			DBG1(DBG_TNC, "reason string is '%.*s' [%.*s]",
-				 (int)reason_string.len, reason_string.ptr,
-				 (int)language_code.len, language_code.ptr);
-			break;
-		}
-		default:
-			break;
-	}
-}
-
-/**
- *  Build a CRETRY or SRETRY batch
- */
-static void build_retry_batch(private_tnccs_20_t *this)
-{
-	pb_tnc_batch_type_t batch_retry_type;
-
-	batch_retry_type = this->is_server ? PB_BATCH_SRETRY : PB_BATCH_CRETRY;
-	if (this->batch_type == batch_retry_type)
-	{
-		/* retry batch has already been selected */
-		return;
-	}
-
-	change_batch_type(this, batch_retry_type);
-
-	if (this->is_server)
-	{
-		this->recs->clear_recommendation(this->recs);
-		tnc->imvs->notify_connection_change(tnc->imvs, this->connection_id,
-											TNC_CONNECTION_STATE_HANDSHAKE);
-	}
-}
-
-METHOD(tls_t, process, status_t,
-	private_tnccs_20_t *this, void *buf, size_t buflen)
-{
-	chunk_t data;
-	pb_tnc_batch_t *batch;
-	pb_tnc_msg_t *msg;
-	enumerator_t *enumerator;
-	status_t status;
-
-	if (this->is_server && !this->connection_id)
-	{
-		this->connection_id = tnc->tnccs->create_connection(tnc->tnccs,
-									TNCCS_2_0, (tnccs_t*)this, _send_msg,
-									&this->request_handshake_retry,
-									this->max_msg_len, &this->recs);
-		if (!this->connection_id)
-		{
-			return FAILED;
-		}
-		tnc->imvs->notify_connection_change(tnc->imvs, this->connection_id,
-											TNC_CONNECTION_STATE_CREATE);
-		tnc->imvs->notify_connection_change(tnc->imvs, this->connection_id,
-											TNC_CONNECTION_STATE_HANDSHAKE);
-	}
-
-	data = chunk_create(buf, buflen);
-	DBG1(DBG_TNC, "received TNCCS batch (%u bytes) for Connection ID %u",
-				   data.len, this->connection_id);
-	DBG3(DBG_TNC, "%B", &data);
-	batch = pb_tnc_batch_create_from_data(this->is_server, data);
-	status = batch->process(batch, this->state_machine);
-
-	if (status != FAILED)
-	{
-		enumerator_t *enumerator;
-		pb_tnc_msg_t *msg;
-		pb_tnc_batch_type_t batch_type;
-		bool empty = TRUE;
-
-		batch_type = batch->get_type(batch);
-
-		if (batch_type == PB_BATCH_CRETRY)
-		{
-			/* Send an SRETRY batch in response */
-			this->mutex->lock(this->mutex);
-			build_retry_batch(this);
-			this->mutex->unlock(this->mutex);
-		}
-		else if (batch_type == PB_BATCH_SRETRY)
-		{
-			/* Restart the measurements */
-			tnc->imcs->notify_connection_change(tnc->imcs,
-			this->connection_id, TNC_CONNECTION_STATE_HANDSHAKE);
-			this->send_msg = TRUE;
-			tnc->imcs->begin_handshake(tnc->imcs, this->connection_id);
-			this->send_msg = FALSE;
-		}
-
-		enumerator = batch->create_msg_enumerator(batch);
-		while (enumerator->enumerate(enumerator, &msg))
-		{
-			handle_message(this, msg);
-			empty = FALSE;
-		}
-		enumerator->destroy(enumerator);
-
-		/* received an empty CLOSE batch from PB-TNC client */
-		if (this->is_server && batch_type == PB_BATCH_CLOSE && empty)
-		{
-			batch->destroy(batch);
-			if (this->fatal_error)
-			{
-				DBG1(DBG_TNC, "a fatal PB-TNC error occurred, "
-							  "terminating connection");
-				return FAILED;
-			}
-			else
-			{
-				return SUCCESS;
-			}
-		}
-
-		this->send_msg = TRUE;
-		if (this->is_server)
-		{
-			tnc->imvs->batch_ending(tnc->imvs, this->connection_id);
-		}
-		else
-		{
-			tnc->imcs->batch_ending(tnc->imcs, this->connection_id);
-		}
-		this->send_msg = FALSE;
-	}
-
-	switch (status)
-	{
-		case FAILED:
-			this->fatal_error = TRUE;
-			this->mutex->lock(this->mutex);
-			change_batch_type(this, PB_BATCH_CLOSE);
-			this->mutex->unlock(this->mutex);
-			/* fall through to add error messages to outbound batch */
-		case VERIFY_ERROR:
-			enumerator = batch->create_error_enumerator(batch);
-			while (enumerator->enumerate(enumerator, &msg))
-			{
-				this->mutex->lock(this->mutex);
-				this->messages->insert_last(this->messages, msg->get_ref(msg));
-				this->mutex->unlock(this->mutex);
-			}
-			enumerator->destroy(enumerator);
-			break;
-		case SUCCESS:
-		default:
-			break;
-	}
-	batch->destroy(batch);
-
-	return NEED_MORE;
-}
-
-/**
- *  Build a RESULT batch if a final recommendation is available
- */
-static void check_and_build_recommendation(private_tnccs_20_t *this)
-{
-	TNC_IMV_Action_Recommendation rec;
-	TNC_IMV_Evaluation_Result eval;
-	TNC_ConnectionState state;
-	TNC_IMVID id;
-	chunk_t reason, language;
-	enumerator_t *enumerator;
-	pb_tnc_msg_t *msg;
-	pb_access_recommendation_code_t pb_rec;
-
-	if (!this->recs->have_recommendation(this->recs, &rec, &eval))
-	{
-		tnc->imvs->solicit_recommendation(tnc->imvs, this->connection_id);
-	}
-	if (this->recs->have_recommendation(this->recs, &rec, &eval))
-	{
-		this->batch_type = PB_BATCH_RESULT;
-
-		msg = pb_assessment_result_msg_create(eval);
-		this->messages->insert_last(this->messages, msg);
-
-		/**
-		 * Map IMV Action Recommendation codes to PB Access Recommendation codes
-		 * and communicate Access Recommendation to IMVs
-		 */
-		switch (rec)
-		{
-			case TNC_IMV_ACTION_RECOMMENDATION_ALLOW:
-				state = TNC_CONNECTION_STATE_ACCESS_ALLOWED;
-				pb_rec = PB_REC_ACCESS_ALLOWED;
-				break;
-			case TNC_IMV_ACTION_RECOMMENDATION_ISOLATE:
-				state = TNC_CONNECTION_STATE_ACCESS_ISOLATED;
-				pb_rec = PB_REC_QUARANTINED;
-				break;
-			case TNC_IMV_ACTION_RECOMMENDATION_NO_ACCESS:
-			case TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION:
-			default:
-				state = TNC_CONNECTION_STATE_ACCESS_NONE;
-				pb_rec = PB_REC_ACCESS_DENIED;
-		}
-		tnc->imvs->notify_connection_change(tnc->imvs, this->connection_id,
-											state);
-
-		msg = pb_access_recommendation_msg_create(pb_rec);
-		this->messages->insert_last(this->messages, msg);
-
-		enumerator = this->recs->create_reason_enumerator(this->recs);
-		while (enumerator->enumerate(enumerator, &id, &reason, &language))
-		{
-			msg = pb_reason_string_msg_create(reason, language);
-			this->messages->insert_last(this->messages, msg);
-		}
-		enumerator->destroy(enumerator);
-	}
-}
-
-METHOD(tls_t, build, status_t,
-	private_tnccs_20_t *this, void *buf, size_t *buflen, size_t *msglen)
-{
-	status_t status;
-	pb_tnc_state_t state;
-
-	/* Initialize the connection */
-	if (!this->is_server && !this->connection_id)
-	{
-		pb_tnc_msg_t *msg;
-		char *pref_lang;
-
-		this->connection_id = tnc->tnccs->create_connection(tnc->tnccs,
-										TNCCS_2_0, (tnccs_t*)this, _send_msg,
-										&this->request_handshake_retry,
-										this->max_msg_len, NULL);
-		if (!this->connection_id)
-		{
-			return FAILED;
-		}
-
-		/* Create PB-TNC Language Preference message */
-		pref_lang = tnc->imcs->get_preferred_language(tnc->imcs);
-		msg = pb_language_preference_msg_create(chunk_create(pref_lang,
-													strlen(pref_lang)));
-		this->mutex->lock(this->mutex);
-		this->batch_type = PB_BATCH_CDATA;
-		this->messages->insert_last(this->messages, msg);
-		this->mutex->unlock(this->mutex);
-
-		tnc->imcs->notify_connection_change(tnc->imcs, this->connection_id,
-											TNC_CONNECTION_STATE_CREATE);
-		tnc->imcs->notify_connection_change(tnc->imcs, this->connection_id,
-											TNC_CONNECTION_STATE_HANDSHAKE);
-		this->send_msg = TRUE;
-		tnc->imcs->begin_handshake(tnc->imcs, this->connection_id);
-		this->send_msg = FALSE;
-	}
-
-	state = this->state_machine->get_state(this->state_machine);
-
-	if (this->fatal_error && state == PB_STATE_END)
-	{
-		DBG1(DBG_TNC, "a fatal PB-TNC error occurred, terminating connection");
-		return FAILED;
-	}
-
-	/* Do not allow any asynchronous IMCs or IMVs to add additional messages */
-	this->mutex->lock(this->mutex);
-
-	if (this->request_handshake_retry)
-	{
-		if (state != PB_STATE_INIT)
-		{
-			build_retry_batch(this);
-		}
-
-		/* Reset the flag for the next handshake retry request */
-		this->request_handshake_retry = FALSE;
-	}
-
-	if (this->is_server &&  state == PB_STATE_SERVER_WORKING &&
-		this->recs->have_recommendation(this->recs, NULL, NULL))
-	{
-		check_and_build_recommendation(this);
-	}
-
-	if (this->batch_type == PB_BATCH_NONE)
-	{
-		if (this->is_server)
-		{
-			if (state == PB_STATE_SERVER_WORKING)
-			{
-				if (this->state_machine->get_empty_cdata(this->state_machine))
-				{
-					check_and_build_recommendation(this);
-				}
-				else
-				{
-					DBG2(DBG_TNC, "no recommendation available yet, "
-								  "sending empty PB-TNC SDATA batch");
-					this->batch_type = PB_BATCH_SDATA;
-				}
-			}
-		}
-		else
-		{
-			switch (state)
-			{
-				case PB_STATE_CLIENT_WORKING:
-					DBG2(DBG_TNC, "no client data to send, "
-								  "sending empty PB-TNC CDATA batch");
-					this->batch_type = PB_BATCH_CDATA;
-					break;
-				case PB_STATE_DECIDED:
-					/**
-					 * In the DECIDED state and if no CRETRY is under way,
-					 * a PB-TNC client replies with an empty CLOSE batch.
-					 */
-					this->batch_type = PB_BATCH_CLOSE;
-					break;
-				default:
-					break;
-			}
-		}
-	}
-
-	if (this->batch_type != PB_BATCH_NONE)
-	{
-		pb_tnc_batch_t *batch;
-		pb_tnc_msg_t *msg;
-		chunk_t data;
-		int msg_count;
-		enumerator_t *enumerator;
-
-		if (this->state_machine->send_batch(this->state_machine, this->batch_type))
-		{
-			batch = pb_tnc_batch_create(this->is_server, this->batch_type,
-										min(this->max_batch_len, *buflen));
-
-			enumerator = this->messages->create_enumerator(this->messages);
-			while (enumerator->enumerate(enumerator, &msg))
-			{
-				if (batch->add_msg(batch, msg))
-				{
-					this->messages->remove_at(this->messages, enumerator);
-				}
-				else
-				{
-					break;
-				}
-			}
-			enumerator->destroy(enumerator);
-
-			batch->build(batch);
-			data = batch->get_encoding(batch);
-			DBG1(DBG_TNC, "sending PB-TNC %N batch (%d bytes) for Connection ID %u",
-						   pb_tnc_batch_type_names, this->batch_type, data.len,
-						   this->connection_id);
-			DBG3(DBG_TNC, "%B", &data);
-
-			*buflen = data.len;
-			*msglen = 0;
-			memcpy(buf, data.ptr, *buflen);
-			batch->destroy(batch);
-
-			msg_count = this->messages->get_count(this->messages);
-			if (msg_count)
-			{
-				DBG2(DBG_TNC, "queued %d PB-TNC message%s for next %N batch",
-					 msg_count, (msg_count == 1) ? "" : "s",
-					 pb_tnc_batch_type_names, this->batch_type);
-			}
-			else
-			{
-				this->batch_type = PB_BATCH_NONE;
-			}
-
-			status = ALREADY_DONE;
-		}
-		else
-		{
-			change_batch_type(this, PB_BATCH_NONE);
-			status = INVALID_STATE;
-		}
-	}
-	else
-	{
-		DBG1(DBG_TNC, "no PB-TNC batch to send");
-		status = INVALID_STATE;
-	}
-	this->mutex->unlock(this->mutex);
-
-	return status;
-}
-
-METHOD(tls_t, is_server, bool,
-	private_tnccs_20_t *this)
-{
-	return this->is_server;
-}
-
-METHOD(tls_t, get_server_id, identification_t*,
-	private_tnccs_20_t *this)
-{
-	return this->server;
-}
-
-METHOD(tls_t, get_peer_id, identification_t*,
-	private_tnccs_20_t *this)
-{
-	return this->peer;
-}
-
-METHOD(tls_t, get_purpose, tls_purpose_t,
-	private_tnccs_20_t *this)
-{
-	return TLS_PURPOSE_EAP_TNC;
-}
-
-METHOD(tls_t, is_complete, bool,
-	private_tnccs_20_t *this)
-{
-	TNC_IMV_Action_Recommendation rec;
-	TNC_IMV_Evaluation_Result eval;
-
-	if (this->recs && this->recs->have_recommendation(this->recs, &rec, &eval))
-	{
-		return tnc->imvs->enforce_recommendation(tnc->imvs, rec, eval);
-	}
-	else
-	{
-		return FALSE;
-	}
-}
-
-METHOD(tls_t, get_eap_msk, chunk_t,
-	private_tnccs_20_t *this)
-{
-	return chunk_empty;
-}
-
-METHOD(tls_t, destroy, void,
-	private_tnccs_20_t *this)
-{
-	tnc->tnccs->remove_connection(tnc->tnccs, this->connection_id,
-											  this->is_server);
-	this->server->destroy(this->server);
-	this->peer->destroy(this->peer);
-	this->state_machine->destroy(this->state_machine);
-	this->mutex->destroy(this->mutex);
-	this->messages->destroy_offset(this->messages,
-								   offsetof(pb_tnc_msg_t, destroy));
-	free(this);
-}
-
-METHOD(tnccs_t, get_transport, tnc_ift_type_t,
-	private_tnccs_20_t *this)
-{
-	return this->transport;
-}
-
-METHOD(tnccs_t, set_transport, void,
-	private_tnccs_20_t *this, tnc_ift_type_t transport)
-{
-	this->transport = transport;
-}
-
-METHOD(tnccs_t, get_auth_type, u_int32_t,
-	private_tnccs_20_t *this)
-{
-	return this->auth_type;
-}
-
-METHOD(tnccs_t, set_auth_type, void,
-	private_tnccs_20_t *this, u_int32_t auth_type)
-{
-	this->auth_type = auth_type;
-}
-
-/**
- * See header
- */
-tnccs_t* tnccs_20_create(bool is_server,
-						 identification_t *server,
-						 identification_t *peer,
-						 tnc_ift_type_t transport)
-{
-	private_tnccs_20_t *this;
-
-	INIT(this,
-		.public = {
-			.tls = {
-				.process = _process,
-				.build = _build,
-				.is_server = _is_server,
-				.get_server_id = _get_server_id,
-				.get_peer_id = _get_peer_id,
-				.get_purpose = _get_purpose,
-				.is_complete = _is_complete,
-				.get_eap_msk = _get_eap_msk,
-				.destroy = _destroy,
-			},
-			.get_transport = _get_transport,
-			.set_transport = _set_transport,
-			.get_auth_type = _get_auth_type,
-			.set_auth_type = _set_auth_type,
-		},
-		.is_server = is_server,
-		.server = server->clone(server),
-		.peer = peer->clone(peer),
-		.transport = transport,
-		.state_machine = pb_tnc_state_machine_create(is_server),
-		.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
-		.messages = linked_list_create(),
-		.max_batch_len = lib->settings->get_int(lib->settings,
-								"%s.plugins.tnccs-20.max_batch_size", 65522,
-								charon->name),
-		.max_msg_len = lib->settings->get_int(lib->settings,
-								"%s.plugins.tnccs-20.max_message_size", 65490,
-								charon->name),
-	);
-
-	return &this->public;
-}
diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.h b/src/libcharon/plugins/tnccs_20/tnccs_20.h
deleted file mode 100644
index 314935069..000000000
--- a/src/libcharon/plugins/tnccs_20/tnccs_20.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010-2013 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 tnccs_20_h tnccs_20
- * @{ @ingroup tnccs_20
- */
-
-#ifndef TNCCS_20_H_
-#define TNCCS_20_H_
-
-#include <library.h>
-
-#include <tnc/tnccs/tnccs.h>
-
-/**
- * Create an instance of the TNC IF-TNCCS 2.0 protocol handler.
- *
- * @param is_server		TRUE to act as TNC Server, FALSE for TNC Client
- * @param server		Server identity
- * @param peer			Client identity
- * @param transport		Underlying IF-T transport protocol
- * @return				TNC_IF_TNCCS 2.0 protocol stack
- */
-tnccs_t* tnccs_20_create(bool is_server,
-						 identification_t *server,
-						 identification_t *peer,
-						 tnc_ift_type_t transport);
-
-#endif /** TNCCS_20_H_ @}*/
diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20_plugin.c b/src/libcharon/plugins/tnccs_20/tnccs_20_plugin.c
deleted file mode 100644
index f74306c8c..000000000
--- a/src/libcharon/plugins/tnccs_20/tnccs_20_plugin.c
+++ /dev/null
@@ -1,61 +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.
- */
-
-#include "tnccs_20_plugin.h"
-#include "tnccs_20.h"
-
-#include <tnc/tnccs/tnccs_manager.h>
-
-METHOD(plugin_t, get_name, char*,
-	tnccs_20_plugin_t *this)
-{
-	return "tnccs-20";
-}
-
-METHOD(plugin_t, get_features, int,
-	tnccs_20_plugin_t *this, plugin_feature_t *features[])
-{
-	static plugin_feature_t f[] = {
-		PLUGIN_CALLBACK(tnccs_method_register, tnccs_20_create),
-			PLUGIN_PROVIDE(CUSTOM, "tnccs-2.0"),
-				PLUGIN_DEPENDS(CUSTOM, "tnccs-manager"),
-	};
-	*features = f;
-	return countof(f);
-}
-
-METHOD(plugin_t, destroy, void,
-	tnccs_20_plugin_t *this)
-{
-	free(this);
-}
-
-/*
- * see header file
- */
-plugin_t *tnccs_20_plugin_create()
-{
-	tnccs_20_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/tnccs_20/tnccs_20_plugin.h b/src/libcharon/plugins/tnccs_20/tnccs_20_plugin.h
deleted file mode 100644
index 1c4ecf4c9..000000000
--- a/src/libcharon/plugins/tnccs_20/tnccs_20_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 tnccs_20 tnccs_20
- * @ingroup cplugins
- *
- * @defgroup tnccs_20_plugin tnccs_20_plugin
- * @{ @ingroup tnccs_20
- */
-
-#ifndef TNCCS_20_PLUGIN_H_
-#define TNCCS_20_PLUGIN_H_
-
-#include <plugins/plugin.h>
-
-typedef struct tnccs_20_plugin_t tnccs_20_plugin_t;
-
-/**
- * EAP-TNC plugin
- */
-struct tnccs_20_plugin_t {
-
-	/**
-	 * implements plugin interface
-	 */
-	plugin_t plugin;
-};
-
-#endif /** TNCCS_20_PLUGIN_H_ @}*/