implemented IMC/IMV handler
authorAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 4 Nov 2010 13:56:34 +0000 (14:56 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 9 Nov 2010 19:43:50 +0000 (20:43 +0100)
25 files changed:
src/libcharon/Makefile.am
src/libcharon/daemon.c
src/libcharon/daemon.h
src/libcharon/plugins/tnc_imc/Makefile.am
src/libcharon/plugins/tnc_imc/tnc_imc.c [new file with mode: 0644]
src/libcharon/plugins/tnc_imc/tnc_imc.h [new file with mode: 0644]
src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c
src/libcharon/plugins/tnc_imv/Makefile.am
src/libcharon/plugins/tnc_imv/tnc_imv.c [new file with mode: 0644]
src/libcharon/plugins/tnc_imv/tnc_imv.h [new file with mode: 0644]
src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c
src/libcharon/tnc/imc/imc.h [new file with mode: 0644]
src/libcharon/tnc/imv/imv.h [new file with mode: 0644]
src/libcharon/tnc/tnccs/tnccs.c [new file with mode: 0644]
src/libcharon/tnc/tnccs/tnccs.h [new file with mode: 0644]
src/libcharon/tnc/tnccs/tnccs_manager.c [new file with mode: 0644]
src/libcharon/tnc/tnccs/tnccs_manager.h [new file with mode: 0644]
src/libcharon/tnc/tncif.h [new file with mode: 0755]
src/libcharon/tnc/tncifimc.h [new file with mode: 0755]
src/libcharon/tnc/tncifimv.h [new file with mode: 0755]
src/libcharon/tnccs/tnccs.c [deleted file]
src/libcharon/tnccs/tnccs.h [deleted file]
src/libcharon/tnccs/tnccs_manager.c [deleted file]
src/libcharon/tnccs/tnccs_manager.h [deleted file]
src/libstrongswan/utils/leak_detective.c

index 2b76463..3cf4871 100644 (file)
@@ -87,8 +87,10 @@ sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
 sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
 sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
 sa/tasks/task.c sa/tasks/task.h \
-tnccs/tnccs.c tnccs/tnccs.h \
-tnccs/tnccs_manager.h tnccs/tnccs_manager.c
+tnc/tncif.h tnc/tncifimc.h tnc/tncifimv.h \
+tnc/imc/imc.h tnc/imv/imv.h \
+tnc/tnccs/tnccs.c tnc/tnccs/tnccs.h \
+tnc/tnccs/tnccs_manager.h tnc/tnccs/tnccs_manager.c
 
 daemon.lo :            $(top_builddir)/config.status
 
index 4b8e1fa..2f36938 100644 (file)
@@ -128,6 +128,10 @@ static void destroy(private_daemon_t *this)
        DESTROY_IF(this->public.backends);
        DESTROY_IF(this->public.socket);
 
+       /* destroy lists of TNC IMCs and IMVs */
+       DESTROY_IF(this->public.imcs);
+       DESTROY_IF(this->public.imvs);
+
        /* rehook library logging, shutdown logging */
        dbg = dbg_old;
        DESTROY_IF(this->public.bus);
@@ -420,6 +424,8 @@ private_daemon_t *daemon_create()
                        .start = _start,
                        .file_loggers = linked_list_create(),
                        .sys_loggers = linked_list_create(),
+                       .imcs = linked_list_create(),
+                       .imvs = linked_list_create(),
                },
        );
 
index c0c834b..9a2ca8f 100644 (file)
@@ -149,7 +149,7 @@ typedef struct daemon_t daemon_t;
 #include <config/backend_manager.h>
 #include <sa/authenticators/eap/eap_manager.h>
 #include <sa/authenticators/eap/sim_manager.h>
-#include <tnccs/tnccs_manager.h>
+#include <tnc/tnccs/tnccs_manager.h>
 
 #ifdef ME
 #include <sa/connect_manager.h>
@@ -241,6 +241,16 @@ struct daemon_t {
         */
        tnccs_manager_t *tnccs;
 
+       /**
+        * A list of installed TNC Integrity Measurement Collectors
+        */
+       linked_list_t *imcs;
+
+       /**
+        * A list of installed TNC Integrity Measurement Verifiers
+        */
+       linked_list_t *imvs;
+
 #ifdef ME
        /**
         * Connect manager
index ca88694..44f647f 100644 (file)
@@ -1,11 +1,9 @@
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon `xml2-config --cflags`
+       -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
-libstrongswan_tnc_imc_la_LIBADD = -ltnc
-
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnc-imc.la
 else
@@ -13,7 +11,7 @@ plugin_LTLIBRARIES = libstrongswan-tnc-imc.la
 endif
 
 libstrongswan_tnc_imc_la_SOURCES = \
-       tnc_imc_plugin.h tnc_imc_plugin.c
+       tnc_imc_plugin.h tnc_imc_plugin.c tnc_imc.h tnc_imc.c
 
 libstrongswan_tnc_imc_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.c b/src/libcharon/plugins/tnc_imc/tnc_imc.c
new file mode 100644 (file)
index 0000000..6984e58
--- /dev/null
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2006 Mike McCauley
+ * Copyright (C) 2010 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "tnc_imc.h"
+
+#include <dlfcn.h>
+
+#include <debug.h>
+#include <library.h>
+
+typedef struct private_tnc_imc_t private_tnc_imc_t;
+
+struct private_tnc_imc_t {
+
+       /**
+        * Public members of imc_t.
+        */
+       imc_t public;
+
+       /**
+        * Name of loaded IMC
+        */
+       char *name;
+
+       /**
+        * ID of loaded IMC
+        */
+       TNC_IMCID id;
+};
+
+METHOD(imc_t, get_id, TNC_IMCID,
+       private_tnc_imc_t *this)
+{
+       return this->id;
+}
+
+METHOD(imc_t, get_name, char*,
+       private_tnc_imc_t *this)
+{
+       return this->name;
+}
+
+METHOD(imc_t, destroy, void,
+       private_tnc_imc_t *this)
+{
+       free(this->name);
+       free(this);
+}
+
+/**
+ * Described in header.
+ */
+imc_t* tnc_imc_create(char* name, char *filename, TNC_IMCID id)
+{
+       private_tnc_imc_t *this;
+       void *handle;
+
+       INIT(this,
+               .public = {
+                       .get_id = _get_id,
+                       .destroy = _destroy,
+        },
+       );
+
+       handle = dlopen(filename, RTLD_NOW);
+       if (handle == NULL)
+       {
+               DBG1(DBG_TNC, "IMC '%s' failed to load from '%s': %s",
+                                          name, filename, dlerror());
+               free(this->name);
+               free(this);
+               return NULL;
+       }
+
+       /* we do not store or free dlopen() handles, leak_detective requires
+        * the modules to keep loaded until leak report */
+       this->public.initialize = dlsym(handle, "TNC_IMC_Initialize");
+       if (!this->public.initialize)
+    {
+               DBG1(DBG_TNC, "could not resolve TNC_IMC_Initialize in %s: %s\n",
+                                          filename, dlerror());
+               free(this);
+               return NULL;
+       }
+       this->public.notify_connection_change =
+                                                dlsym(handle, "TNC_IMC_NotifyConnectionChange");
+    this->public.begin_handshake = dlsym(handle, "TNC_IMC_BeginHandshake");
+       if (!this->public.begin_handshake)
+    {
+               DBG1(DBG_TNC, "could not resolve TNC_IMC_BeginHandshake in %s: %s\n",
+                                          filename, dlerror());
+               free(this);
+               return NULL;
+       }
+    this->public.receive_message = 
+                                               dlsym(handle, "TNC_IMC_ReceiveMessage");
+    this->public.batch_ending =
+                                               dlsym(handle, "TNC_IMC_BatchEnding");
+    this->public.terminate =
+                                               dlsym(handle, "TNC_IMC_Terminate");
+    this->public.provide_bind_function =
+                                               dlsym(handle, "TNC_IMC_ProvideBindFunction");
+    if (!this->public.provide_bind_function)
+       {
+               DBG1(DBG_TNC, "could not resolve TNC_IMC_ProvideBindFunction in %s: %s\n",
+                                         filename, dlerror());
+               free(this);
+               return NULL;
+       }
+       DBG2(DBG_TNC, "IMC '%s' loaded successfully with ID %u", name, id);
+       this->name = strdup(name);
+       this->id = id;
+
+       return &this->public;
+}
+
diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.h b/src/libcharon/plugins/tnc_imc/tnc_imc.h
new file mode 100644 (file)
index 0000000..2becbdf
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2010 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ *
+ * @defgroup tnc_imc tnc_imc
+ * @{ @ingroup tnc_imc
+ */
+
+#ifndef TNC_IMC_H_
+#define TNC_IMC_H_
+
+#include <tnc/imc/imc.h>
+
+/**
+ * Create an Integrity Measurement Collector.
+ *
+ * @param name                 name of the IMC
+ * @param filename             path to the dynamic IMC library
+ * @param id                   ID of the IMC
+ * @return                             instance of the imc_t interface
+ */
+imc_t* tnc_imc_create(char *name, char *filename, TNC_IMCID id);
+
+#endif /** TNC_IMC_H_ @}*/
index 0ce930b..8348c5d 100644 (file)
  */
 
 #include "tnc_imc_plugin.h"
-
-#include <libtnctncc.h>
+#include "tnc_imc.h"
 
 #include <daemon.h>
 
 METHOD(plugin_t, destroy, void,
        tnc_imc_plugin_t *this)
 {
-       libtnc_tncc_Terminate();
+       imc_t *imc;
+
+       while (charon->imcs->remove_last(charon->imcs, (void**)&imc) == SUCCESS)
+       {
+               if (imc->terminate(imc->get_id(imc)) != TNC_RESULT_SUCCESS)
+               {
+                       DBG1(DBG_TNC, "IMC '%s' not terminated successfully",
+                                                  imc->get_name(imc));
+               }
+               imc->destroy(imc);
+       }
        free(this);
 }
 
@@ -31,8 +40,12 @@ METHOD(plugin_t, destroy, void,
  */
 plugin_t *tnc_imc_plugin_create()
 {
-       char *tnc_config, *pref_lang;
+       TNC_IMCID next_id = 1;
+       TNC_Version version;
+       char *tnc_config, *pref_lang, *name, *filename;
        tnc_imc_plugin_t *this;
+       imc_t *imc;
+       
 
        INIT(this,
                .plugin = {
@@ -45,13 +58,25 @@ plugin_t *tnc_imc_plugin_create()
        tnc_config = lib->settings->get_str(lib->settings,
                                        "charon.plugins.tnc-imc.tnc_config", "/etc/tnc_config");
 
-       if (libtnc_tncc_Initialize(tnc_config) != TNC_RESULT_SUCCESS)
+       name = "Dummy";
+       filename = "/usr/local/lib/libdummyimc.so";
+       imc = tnc_imc_create(name, filename, next_id);
+       if (imc)
        {
-               free(this);
-               DBG1(DBG_TNC, "TNC IMC initialization failed");
-               return NULL;
+               /* Initialize the module */
+               if (imc->initialize(next_id, TNC_IFIMC_VERSION_1, TNC_IFIMC_VERSION_1, 
+                                                       &version) != TNC_RESULT_SUCCESS)
+               {
+                       DBG1(DBG_TNC, "could not initialize IMC '%s'\n",
+                                                  imc->get_name(imc));
+                       imc->destroy(imc);
+               }
+               else
+       {
+                       charon->imcs->insert_last(charon->imcs, imc);
+                       next_id++;
+               }
        }
-
        return &this->plugin;
 }
 
index 9c3b473..28aa49f 100644 (file)
@@ -1,11 +1,9 @@
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-       -I$(top_srcdir)/src/libcharon `xml2-config --cflags`
+       -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
-libstrongswan_tnc_imv_la_LIBADD = -ltnc
-
 if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-tnc-imv.la
 else
@@ -13,7 +11,7 @@ plugin_LTLIBRARIES = libstrongswan-tnc-imv.la
 endif
 
 libstrongswan_tnc_imv_la_SOURCES = \
-       tnc_imv_plugin.h tnc_imv_plugin.c
+       tnc_imv_plugin.h tnc_imv_plugin.c tnc_imv.h tnc_imv.c
 
 libstrongswan_tnc_imv_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv.c b/src/libcharon/plugins/tnc_imv/tnc_imv.c
new file mode 100644 (file)
index 0000000..6982bd3
--- /dev/null
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2006 Mike McCauley
+ * Copyright (C) 2010 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "tnc_imv.h"
+
+#include <dlfcn.h>
+
+#include <debug.h>
+#include <library.h>
+
+typedef struct private_tnc_imv_t private_tnc_imv_t;
+
+struct private_tnc_imv_t {
+
+       /**
+        * Public members of imv_t.
+        */
+       imv_t public;
+
+       /**
+        * Name of loaded IMV
+        */
+       char *name;
+
+       /**
+        * ID of loaded IMV
+        */
+       TNC_IMVID id;
+};
+
+METHOD(imv_t, get_id, TNC_IMVID,
+       private_tnc_imv_t *this)
+{
+       return this->id;
+}
+
+METHOD(imv_t, destroy, void,
+       private_tnc_imv_t *this)
+{
+       free(this->name);
+       free(this);
+}
+
+/**
+ * Described in header.
+ */
+imv_t* tnc_imv_create(char *name, char *filename, TNC_IMVID id)
+{
+       private_tnc_imv_t *this;
+       void *handle;
+
+       INIT(this,
+               .public = {
+                       .get_id = _get_id,
+                       .destroy = _destroy,
+        },
+       );
+
+       handle = dlopen(filename, RTLD_NOW);
+       if (handle == NULL)
+       {
+               DBG1(DBG_TNC, "IMV '%s' failed to load from '%s': %s",
+                                          name, filename, dlerror());
+               free(this);
+               return NULL;
+       }
+
+       /* we do not store or free dlopen() handles, leak_detective requires
+        * the modules to keep loaded until leak report */
+
+       this->public.initialize = dlsym(handle, "TNC_IMV_Initialize");
+       if (!this->public.initialize)
+    {
+               DBG1(DBG_TNC, "could not resolve TNC_IMV_Initialize in %s: %s\n",
+                                          filename, dlerror());
+               free(this);
+               return NULL;
+       }
+       this->public.notify_connection_change =
+                                               dlsym(handle, "TNC_IMV_NotifyConnectionChange");
+    this->public.solicit_recommendation =
+                                               dlsym(handle, "TNC_IMV_SolicitRecommendation");
+       if (!this->public.solicit_recommendation)
+    {
+               DBG1(DBG_TNC, "could not resolve TNC_IMV_SolicitRecommendation in %s: %s\n",
+                                          filename, dlerror());
+               free(this);
+               return NULL;
+       }
+    this->public.receive_message = 
+                                               dlsym(handle, "TNC_IMV_ReceiveMessage");
+    this->public.batch_ending =
+                                               dlsym(handle, "TNC_IMV_BatchEnding");
+    this->public.terminate =
+                                               dlsym(handle, "TNC_IMV_Terminate");
+    this->public.provide_bind_function =
+                                               dlsym(handle, "TNC_IMV_ProvideBindFunction");
+    if (!this->public.provide_bind_function)
+       {
+               DBG1(DBG_TNC, "could not resolve TNC_IMV_ProvideBindFunction in %s: %s\n",
+                                         filename, dlerror());
+               free(this);
+               return NULL;
+       }
+       DBG2(DBG_TNC, "IMV '%s' loaded successfully with ID %u", name, id);
+       this->name = strdup(name);
+       this->id = id;
+
+       return &this->public;
+}
+
diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv.h b/src/libcharon/plugins/tnc_imv/tnc_imv.h
new file mode 100644 (file)
index 0000000..694aa63
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2010 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ *
+ * @defgroup tnc_imv tnc_imv
+ * @{ @ingroup tnc_imv
+ */
+
+#ifndef TNC_IMV_H_
+#define TNC_IMV_H_
+
+#include <tnc/imv/imv.h>
+
+/**
+ * Create an Integrity Measurement Verifier.
+ *
+ * @param name                 name of the IMV
+ * @param filename             path to the dynamic IMV library
+ * @param id                   ID of the IMV
+ * @return                             instance of the imv_t interface
+ */
+imv_t* tnc_imv_create(char *name, char *filename, TNC_IMVID id);
+
+#endif /** TNC_IMV_H_ @}*/
index 5b3d389..5a43ad8 100644 (file)
  */
 
 #include "tnc_imv_plugin.h"
-
-#include <libtnctncs.h>
+#include "tnc_imv.h"
 
 #include <daemon.h>
 
 METHOD(plugin_t, destroy, void,
        tnc_imv_plugin_t *this)
 {
-       libtnc_tncs_Terminate();
+       imv_t *imv;
+
+       while (charon->imvs->remove_last(charon->imvs, (void**)&imv) == SUCCESS)
+       {
+               if (imv->terminate(imv->get_id(imv)) != TNC_RESULT_SUCCESS)
+               {
+                       DBG1(DBG_TNC, "IMV '%s' not terminated successfully",
+                                                  imv->get_name(imv));
+               }
+               imv->destroy(imv);
+       }
        free(this);
 }
 
@@ -31,8 +40,11 @@ METHOD(plugin_t, destroy, void,
  */
 plugin_t *tnc_imv_plugin_create()
 {
-       char *tnc_config;
+       TNC_IMVID next_id = 1;
+       TNC_Version version;
+       char *tnc_config, *name, *filename;
        tnc_imv_plugin_t *this;
+       imv_t *imv;
 
        INIT(this,
                .plugin = {
@@ -42,13 +54,26 @@ plugin_t *tnc_imv_plugin_create()
 
        tnc_config = lib->settings->get_str(lib->settings,
                                        "charon.plugins.tnc-imv.tnc_config", "/etc/tnc_config");
-       if (libtnc_tncs_Initialize(tnc_config) != TNC_RESULT_SUCCESS)
+
+       name = "Dummy";
+       filename = "/usr/local/lib/libdummyimv.so";
+       imv = tnc_imv_create(name, filename, next_id);
+       if (imv)
        {
-               free(this);
-               DBG1(DBG_TNC, "TNC IMV initialization failed");
-               return NULL;
+               /* Initialize the module */
+               if (imv->initialize(next_id, TNC_IFIMV_VERSION_1, TNC_IFIMV_VERSION_1, 
+                                                       &version) != TNC_RESULT_SUCCESS)
+               {
+                       DBG1(DBG_TNC, "could not initialize IMV '%s'\n",
+                                                  imv->get_name(imv));
+                       imv->destroy(imv);
+               }
+               else
+       {
+                       charon->imvs->insert_last(charon->imvs, imv);
+                       next_id++;
+               }
        }
-
        return &this->plugin;
 }
 
diff --git a/src/libcharon/tnc/imc/imc.h b/src/libcharon/tnc/imc/imc.h
new file mode 100644 (file)
index 0000000..a4bef61
--- /dev/null
@@ -0,0 +1,144 @@
+/*
+ * 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 imc imc
+ * @{ @ingroup libcharon
+ */
+
+#ifndef IMV_H_
+#define IMV_H_
+
+#include <tnc/tncifimc.h>
+
+typedef struct imc_t imc_t;
+
+struct imc_t {
+
+       /**
+        * The TNC Client calls this function to initialize the IMC and agree on
+        * the API version number to be used. It also supplies the IMC ID, an IMC
+        * identifier that the IMC must use when calling TNC Client callback functions.
+        *
+        * @param imcID                         IMC ID assigned by TNCC
+        * @param minVersion            Minimum API version supported by TNCC
+        * @param maxVersion            Maximum API version supported by TNCC
+        * @param OutActualVersion      Mutually supported API version number
+        * @result                                      TNC result code
+        */
+       TNC_Result (*initialize)(TNC_IMCID imcID,
+                                                        TNC_Version minVersion,
+                                                        TNC_Version maxVersion,
+                                                        TNC_Version *OutActualVersion);
+
+       /**
+        * The TNC Client calls this function to inform the IMC that the state of
+        * the network connection identified by connectionID has changed to newState.
+        *
+        * @param imcID                         IMC ID assigned by TNCC
+        * @param connectionID          Network connection ID assigned by TNCC
+        * @param newState                      New network connection state
+        * @result                                      TNC result code
+        */
+       TNC_Result (*notify_connection_change)(TNC_IMCID imcID,
+                                                                                  TNC_ConnectionID connectionID,
+                                                                                  TNC_ConnectionState newState);
+
+       /**
+        * The TNC Client calls this function to indicate that an Integrity Check
+        * Handshake is beginning and solicit messages from IMCs for the first batch. 
+        *
+        * @param imcID                         IMC ID assigned by TNCC
+        * @param connectionID          Network connection ID assigned by TNCC
+        * @result                                      TNC result code
+        */
+       TNC_Result (*begin_handshake)(TNC_IMCID imcID,
+                                                                 TNC_ConnectionID connectionID);
+
+       /**
+        * The TNC Client calls this function to deliver a message to the IMC.
+        * The message is contained in the buffer referenced by message and contains
+        * the number of octets indicated by messageLength. The type of the message
+        * is indicated by messageType.
+        *
+        * @param imcID                         IMC ID assigned by TNCS
+        * @param connectionID          Network connection ID assigned by TNCC
+        * @param message                       Reference to buffer containing message
+        * @param messageLength         Number of octets in message
+        * @param messageType           Message type of message
+        * @result                                      TNC result code
+        */
+       TNC_Result (*receive_message)(TNC_IMCID imcID,
+                                                                 TNC_ConnectionID connectionID,
+                                                                 TNC_BufferReference message,
+                                                                 TNC_UInt32 messageLength,
+                                                                 TNC_MessageType messageType);
+
+       /**
+        * The TNC Client calls this function to notify IMCs that all IMV messages
+        * received in a batch have been delivered and this is the IMC’s last chance
+        * to send a message in the batch of IMC messages currently being collected.
+        *
+        * @param imcID                         IMC ID assigned by TNCC
+        * @param connectionID          Network connection ID assigned by TNCC
+        * @result                                      TNC result code
+        */
+       TNC_Result (*batch_ending)(TNC_IMCID imcID,
+                                                          TNC_ConnectionID connectionID);
+
+       /**
+        * The TNC Client calls this function to close down the IMC when all work is
+        * complete or the IMC reports TNC_RESULT_FATAL.
+        *
+        * @param imcID                         IMC ID assigned by TNCC
+        * @result                                      TNC result code
+        */
+       TNC_Result (*terminate)(TNC_IMCID imcID);
+
+       /**
+        * IMVs implementing the UNIX/Linux Dynamic Linkage platform binding MUST
+        * define this additional function. The TNC Server MUST call the function
+        * immediately after calling TNC_IMV_Initialize to provide a pointer to the
+        * TNCS bind function. The IMV can then use the TNCS bind function to obtain
+        * pointers to any other TNCS functions.
+        *
+        * @param imcID                         IMC ID assigned by TNCC
+        * @param bindFunction          Pointer to TNC_TNCC_BindFunction
+        * @result                                      TNC result code
+        */
+       TNC_Result (*provide_bind_function)(TNC_IMCID imcID,
+                                                                               TNC_TNCC_BindFunctionPointer bindFunction);
+
+       /**
+        * Returns the ID of an imc_t object.
+        *
+        * @result                                      IMC ID assigned by TNCC
+        */
+       TNC_IMCID (*get_id)(imc_t *this);
+
+       /**
+        * Returns the name of an imc_t object.
+        *
+        * @result                                      name of IMC
+        */
+       char* (*get_name)(imc_t *this);
+
+       /**
+        * Destroys an imc_t object.
+        */
+       void (*destroy)(imc_t *this);
+};
+
+#endif /** IMV_H_ @}*/
diff --git a/src/libcharon/tnc/imv/imv.h b/src/libcharon/tnc/imv/imv.h
new file mode 100644 (file)
index 0000000..8b598d5
--- /dev/null
@@ -0,0 +1,144 @@
+/*
+ * 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 imv imv
+ * @{ @ingroup libcharon
+ */
+
+#ifndef IMV_H_
+#define IMV_H_
+
+#include <tnc/tncifimv.h>
+
+typedef struct imv_t imv_t;
+
+struct imv_t {
+
+       /**
+        * The TNC Server calls this function to initialize the IMV and agree on
+        * the API version number to be used. It also supplies the IMV ID, an IMV
+        * identifier that the IMV must use when calling TNC Server callback functions.
+        *
+        * @param imvID                         IMV ID assigned by TNCS
+        * @param minVersion            Minimum API version supported 
+        * @param maxVersion            Maximum API version supported by TNCS
+        * @param OutActualVersion      Mutually supported API version number
+        * @result                                      TNC result code
+        */
+       TNC_Result (*initialize)(TNC_IMVID imvID,
+                                                        TNC_Version minVersion,
+                                                        TNC_Version maxVersion,
+                                                        TNC_Version *OutActualVersion);
+
+       /**
+        * The TNC Server calls this function to inform the IMV that the state of
+        * the network connection identified by connectionID has changed to newState.
+        *
+        * @param imvID                         IMV ID assigned by TNCS
+        * @param connectionID          Network connection ID assigned by TNCS
+        * @param newState                      New network connection state
+        * @result                                      TNC result code
+        */
+       TNC_Result (*notify_connection_change)(TNC_IMVID imvID,
+                                                                                  TNC_ConnectionID connectionID,
+                                                                                  TNC_ConnectionState newState);
+
+       /**
+        * The TNC Server calls this function at the end of an Integrity Check
+        * Handshake (after all IMC-IMV messages have been delivered) to solicit
+        * recommendations from IMVs that have not yet provided a recommendation.
+        *
+        * @param imvID                         IMV ID assigned by TNCS
+        * @param connectionID          Network connection ID assigned by TNCS
+        * @result                                      TNC result code
+        */
+       TNC_Result (*solicit_recommendation)(TNC_IMVID imvID,
+                                                                                TNC_ConnectionID connectionID);
+
+       /**
+        * The TNC Server calls this function to deliver a message to the IMV.
+        * The message is contained in the buffer referenced by message and contains
+        * the number of octets indicated by messageLength. The type of the message
+        * is indicated by messageType.
+        *
+        * @param imvID                         IMV ID assigned by TNCS
+        * @param connectionID          Network connection ID assigned by TNCS
+        * @param message                       Reference to buffer containing message
+        * @param messageLength         Number of octets in message
+        * @param messageType           Message type of message
+        * @result                                      TNC result code
+        */
+       TNC_Result (*receive_message)(TNC_IMVID imvID,
+                                                                 TNC_ConnectionID connectionID,
+                                                                 TNC_BufferReference message,
+                                                                 TNC_UInt32 messageLength,
+                                                                 TNC_MessageType messageType);
+
+       /**
+        * The TNC Server calls this function to notify IMVs that all IMC messages
+        * received in a batch have been delivered and this is the IMV’s last chance
+        * to send a message in the batch of IMV messages currently being collected.
+        *
+        * @param imvID                         IMV ID assigned by TNCS
+        * @param connectionID          Network connection ID assigned by TNCS
+        * @result                                      TNC result code
+        */
+       TNC_Result (*batch_ending)(TNC_IMVID imvID,
+                                                          TNC_ConnectionID connectionID);
+
+       /**
+        * The TNC Server calls this function to close down the IMV.
+        *
+        * @param imvID                         IMV ID assigned by TNCS
+        * @result                                      TNC result code
+        */
+       TNC_Result (*terminate)(TNC_IMVID imvID);
+
+       /**
+        * IMVs implementing the UNIX/Linux Dynamic Linkage platform binding MUST
+        * define this additional function. The TNC Server MUST call the function
+        * immediately after calling TNC_IMV_Initialize to provide a pointer to the
+        * TNCS bind function. The IMV can then use the TNCS bind function to obtain
+        * pointers to any other TNCS functions.
+        *
+        * @param imvID                         IMV ID assigned by TNCS
+        * @param bindFunction          Pointer to TNC_TNCS_BindFunction
+        * @result                                      TNC result code
+        */
+       TNC_Result (*provide_bind_function)(TNC_IMVID imvID,
+                                                                               TNC_TNCS_BindFunctionPointer bindFunction);
+
+       /**
+        * Returns the ID of an imv_t object.
+        *
+        * @result                                      IMV ID assigned by TNCS
+        */
+       TNC_IMVID (*get_id)(imv_t *this);
+
+       /**
+        * Returns the name of an imv_t object.
+        *
+        * @result                                      name of IMV
+        */
+       char* (*get_name)(imv_t *this);
+
+       /**
+        * Destroys an imv_t object.
+        */
+       void (*destroy)(imv_t *this);
+};
+
+#endif /** IMV_H_ @}*/
diff --git a/src/libcharon/tnc/tnccs/tnccs.c b/src/libcharon/tnc/tnccs/tnccs.c
new file mode 100644 (file)
index 0000000..2facf02
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+ * 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.h"
+
+ENUM(eap_type_names, TNCCS_1_1, TNCCS_2_0,
+       "TNCCS 1.1",
+       "TNCCS SOH",
+       "TNCCS 2.0",
+);
diff --git a/src/libcharon/tnc/tnccs/tnccs.h b/src/libcharon/tnc/tnccs/tnccs.h
new file mode 100644 (file)
index 0000000..583512e
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * 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 tnccs
+ * @{ @ingroup libcharon
+ */
+
+#ifndef TNCCS_H_
+#define TNCCS_H_
+
+typedef enum tnccs_type_t tnccs_type_t;
+
+#include <library.h>
+
+/**
+ * Type of TNC Client/Server protocol
+ */
+enum tnccs_type_t {
+       TNCCS_1_1,
+       TNCCS_SOH,
+       TNCCS_2_0
+};
+
+/**
+ * enum names for tnccs_type_t.
+ */
+extern enum_name_t *tnccs_type_names;
+
+typedef struct tnccs_t tnccs_t;
+
+/**
+ * Constructor definition for a pluggable TNCCS protocol implementation.
+ *
+ * @param is_server            TRUE if TNC Server, FALSE if TNC Client
+ * @return                             implementation of the tnccs_t interface
+ */
+typedef tnccs_t* (*tnccs_constructor_t)(bool is_server);
+
+#endif /** TNC_H_ @}*/
diff --git a/src/libcharon/tnc/tnccs/tnccs_manager.c b/src/libcharon/tnc/tnccs/tnccs_manager.c
new file mode 100644 (file)
index 0000000..0fd6737
--- /dev/null
@@ -0,0 +1,148 @@
+/*
+ * 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_manager.h"
+
+#include <utils/linked_list.h>
+#include <threading/rwlock.h>
+
+typedef struct private_tnccs_manager_t private_tnccs_manager_t;
+typedef struct tnccs_entry_t tnccs_entry_t;
+
+/**
+ * TNCCS constructor entry
+ */
+struct tnccs_entry_t {
+
+       /**
+        * TNCCS protocol type
+        */
+       tnccs_type_t type;
+
+       /**
+        * constructor function to create instance
+        */
+       tnccs_constructor_t constructor;
+};
+
+/**
+ * private data of tnccs_manager
+ */
+struct private_tnccs_manager_t {
+
+       /**
+        * public functions
+        */
+       tnccs_manager_t public;
+
+       /**
+        * list of tnccs_entry_t's
+        */
+       linked_list_t *protocols;
+
+       /**
+        * rwlock to lock methods
+        */
+       rwlock_t *lock;
+};
+
+METHOD(tnccs_manager_t, add_method, void,
+       private_tnccs_manager_t *this, tnccs_type_t type,
+       tnccs_constructor_t constructor)
+{
+       tnccs_entry_t *entry = malloc_thing(tnccs_entry_t);
+
+       entry->type = type;
+       entry->constructor = constructor;
+
+       this->lock->write_lock(this->lock);
+       this->protocols->insert_last(this->protocols, entry);
+       this->lock->unlock(this->lock);
+}
+
+METHOD(tnccs_manager_t, remove_method, void,
+       private_tnccs_manager_t *this, tnccs_constructor_t constructor)
+{
+       enumerator_t *enumerator;
+       tnccs_entry_t *entry;
+
+       this->lock->write_lock(this->lock);
+       enumerator = this->protocols->create_enumerator(this->protocols);
+       while (enumerator->enumerate(enumerator, &entry))
+       {
+               if (constructor == entry->constructor)
+               {
+                       this->protocols->remove_at(this->protocols, enumerator);
+                       free(entry);
+               }
+       }
+       enumerator->destroy(enumerator);
+       this->lock->unlock(this->lock);
+}
+
+METHOD(tnccs_manager_t, create_instance, tnccs_t*,
+       private_tnccs_manager_t *this, tnccs_type_t type, bool is_server)
+{
+       enumerator_t *enumerator;
+       tnccs_entry_t *entry;
+       tnccs_t *protocol = NULL;
+
+       this->lock->read_lock(this->lock);
+       enumerator = this->protocols->create_enumerator(this->protocols);
+       while (enumerator->enumerate(enumerator, &entry))
+       {
+               if (type == entry->type)
+               {
+                       protocol = entry->constructor(is_server);
+                       if (protocol)
+                       {
+                               break;
+                       }
+               }
+       }
+       enumerator->destroy(enumerator);
+       this->lock->unlock(this->lock);
+       return protocol;
+}
+
+METHOD(tnccs_manager_t, destroy, void,
+       private_tnccs_manager_t *this)
+{
+       this->protocols->destroy_function(this->protocols, free);
+       this->lock->destroy(this->lock);
+       free(this);
+}
+
+/*
+ * See header
+ */
+tnccs_manager_t *tnccs_manager_create()
+{
+       private_tnccs_manager_t *this;
+
+       INIT(this,
+                       .public = {
+                               .add_method = _add_method,
+                               .remove_method = _remove_method,
+                               .create_instance = _create_instance,
+                               .destroy = _destroy,
+                       },
+                       .protocols = linked_list_create(),
+                       .lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
+       );
+
+       return &this->public;
+}
+
diff --git a/src/libcharon/tnc/tnccs/tnccs_manager.h b/src/libcharon/tnc/tnccs/tnccs_manager.h
new file mode 100644 (file)
index 0000000..2f4a961
--- /dev/null
@@ -0,0 +1,74 @@
+/*
+ * 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_manager tnccs_manager
+ * @{ @ingroup tnccs
+ */
+
+#ifndef TNCCS_MANAGER_H_
+#define TNCCS_MANAGER_H_
+
+#include "tnccs.h"
+
+typedef struct tnccs_manager_t tnccs_manager_t;
+
+/**
+ * The TNCCS manager manages all TNCCS implementations and creates instances.
+ *
+ * A plugin registers its implemented TNCCS protocol with the manager by
+ * providing type and a constructor function. The manager then creates
+ * TNCCS protocol instances via the provided constructor.
+ */
+struct tnccs_manager_t {
+
+       /**
+        * Register a TNCCS protocol implementation.
+        *
+        * @param type                  TNCCS protocol type
+        * @param constructor   constructor, returns a TNCCS protocol implementation
+        */
+       void (*add_method)(tnccs_manager_t *this, tnccs_type_t type,
+                                          tnccs_constructor_t constructor);
+
+       /**
+        * Unregister a TNCCS protocol implementation using it's constructor.
+        *
+        * @param constructor   constructor function to remove, as added in add_method
+        */
+       void (*remove_method)(tnccs_manager_t *this, tnccs_constructor_t constructor);
+
+       /**
+        * Create a new TNCCS protocol instance.
+        *
+        * @param type                  type of the TNCCS protocol
+        * @param is_server             TRUE if TNC Server, FALSE if TNC Client
+        * @return                              TNCCS protocol instance, NULL if no constructor found
+        */
+       tnccs_t* (*create_instance)(tnccs_manager_t *this, tnccs_type_t type,
+                                                               bool is_server);
+
+       /**
+        * Destroy a tnccs_manager instance.
+        */
+       void (*destroy)(tnccs_manager_t *this);
+};
+
+/**
+ * Create a tnccs_manager instance.
+ */
+tnccs_manager_t *tnccs_manager_create();
+
+#endif /** TNCCS_MANAGER_H_ @}*/
diff --git a/src/libcharon/tnc/tncif.h b/src/libcharon/tnc/tncif.h
new file mode 100755 (executable)
index 0000000..0c55cc0
--- /dev/null
@@ -0,0 +1,103 @@
+/* tncif.h
+ *
+ * Trusted Network Connect IF-IMV API version 1.20
+ * Microsoft Windows DLL Platform Binding C Header
+ * February 5, 2007
+ *
+ * Copyright(c) 2005-2007, Trusted Computing Group, Inc. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in
+ *   the documentation and/or other materials provided with the  
+ *   distribution.
+ * - Neither the name of the Trusted Computing Group nor the names of
+ *   its contributors may be used to endorse or promote products 
+ *   derived from this software without specific prior written 
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contact the Trusted Computing Group at 
+ * admin@trustedcomputinggroup.org for information on specification 
+ * licensing through membership agreements.
+ *
+ * Any marks and brands contained herein are the property of their 
+ * respective owners.
+ *
+ * Trusted Network Connect IF-IMC/IF-IMV API version 1.00 Revision 3
+ * Microsoft Windows DLL Platform Binding C Header
+ * Common definitions for IF-IMC and IF-IMV
+ * extracted from tncifimc.h and tncifimv.h
+ * Feb 12, 2007
+ */
+#ifndef _TNCIF_H
+#define _TNCIF_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Basic Types */
+typedef unsigned long TNC_UInt32;
+typedef unsigned char *TNC_BufferReference;
+
+/* Derived Types */
+typedef TNC_UInt32 TNC_ConnectionID;
+typedef TNC_UInt32 TNC_ConnectionState;
+typedef TNC_UInt32 TNC_RetryReason;
+typedef TNC_UInt32 TNC_MessageType;
+typedef TNC_MessageType *TNC_MessageTypeList;
+typedef TNC_UInt32 TNC_VendorID;
+typedef TNC_UInt32 TNC_MessageSubtype;
+typedef TNC_UInt32 TNC_Version;
+typedef TNC_UInt32 TNC_Result;
+
+/* Result Codes */
+#define TNC_RESULT_SUCCESS 0
+#define TNC_RESULT_NOT_INITIALIZED 1
+#define TNC_RESULT_ALREADY_INITIALIZED 2
+#define TNC_RESULT_NO_COMMON_VERSION 3
+#define TNC_RESULT_CANT_RETRY 4
+#define TNC_RESULT_WONT_RETRY 5
+#define TNC_RESULT_INVALID_PARAMETER 6
+#define TNC_RESULT_CANT_RESPOND 7
+#define TNC_RESULT_ILLEGAL_OPERATION 8
+#define TNC_RESULT_OTHER 9
+#define TNC_RESULT_FATAL 10
+
+/* Network Connection ID Values */
+#define TNC_CONNECTIONID_ANY 0xFFFFFFFF
+/* Network Connection State Values */
+#define TNC_CONNECTION_STATE_CREATE 0
+#define TNC_CONNECTION_STATE_HANDSHAKE 1
+#define TNC_CONNECTION_STATE_ACCESS_ALLOWED 2
+#define TNC_CONNECTION_STATE_ACCESS_ISOLATED 3
+#define TNC_CONNECTION_STATE_ACCESS_NONE 4
+#define TNC_CONNECTION_STATE_DELETE 5
+
+/* Vendor ID Values */
+#define TNC_VENDORID_TCG 0
+#define TNC_VENDORID_ANY ((TNC_VendorID) 0xffffff)
+/* Message Subtype Values */
+#define TNC_SUBTYPE_ANY ((TNC_MessageSubtype) 0xff)
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/libcharon/tnc/tncifimc.h b/src/libcharon/tnc/tncifimc.h
new file mode 100755 (executable)
index 0000000..b7be356
--- /dev/null
@@ -0,0 +1,193 @@
+/* tncifimc.h
+ *
+ * Trusted Network Connect IF-IMC API version 1.20 Revision 8
+ * Microsoft Windows DLL Platform Binding C Header
+ * February 5, 2007
+ *
+ * Copyright(c) 2005-2007, Trusted Computing Group, Inc. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in
+ *   the documentation and/or other materials provided with the  
+ *   distribution.
+ * - Neither the name of the Trusted Computing Group nor the names of
+ *   its contributors may be used to endorse or promote products 
+ *   derived from this software without specific prior written 
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contact the Trusted Computing Group at 
+ * admin@trustedcomputinggroup.org for information on specification 
+ * licensing through membership agreements.
+ *
+ * Any marks and brands contained herein are the property of their 
+ * respective owners.
+ *
+ */
+
+#ifndef _TNCIFIMC_H
+#define _TNCIFIMC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef WIN32
+#ifdef TNC_IMC_EXPORTS
+#define TNC_IMC_API __declspec(dllexport)
+#else
+#define TNC_IMC_API __declspec(dllimport)
+#endif
+#else
+#define TNC_IMC_API
+#endif
+
+#include "tncif.h"
+
+/* Derived Types */
+
+typedef TNC_UInt32 TNC_IMCID;
+
+/* Function pointers */
+
+typedef TNC_Result (*TNC_IMC_InitializePointer)(
+    TNC_IMCID imcID,
+    TNC_Version minVersion,
+    TNC_Version maxVersion,
+    TNC_Version *pOutActualVersion);
+typedef TNC_Result (*TNC_IMC_NotifyConnectionChangePointer)(
+    TNC_IMCID imcID,
+    TNC_ConnectionID connectionID,
+    TNC_ConnectionState newState);
+typedef TNC_Result (*TNC_IMC_BeginHandshakePointer)(
+    TNC_IMCID imcID,
+    TNC_ConnectionID connectionID);
+typedef TNC_Result (*TNC_IMC_ReceiveMessagePointer)(
+    TNC_IMCID imcID,
+    TNC_ConnectionID connectionID,
+    TNC_BufferReference message,
+    TNC_UInt32 messageLength,
+    TNC_MessageType messageType);
+typedef TNC_Result (*TNC_IMC_BatchEndingPointer)(
+    TNC_IMCID imcID,
+    TNC_ConnectionID connectionID);
+typedef TNC_Result (*TNC_IMC_TerminatePointer)(
+    TNC_IMCID imcID);
+typedef TNC_Result (*TNC_TNCC_ReportMessageTypesPointer)(
+    TNC_IMCID imcID,
+    TNC_MessageTypeList supportedTypes,
+    TNC_UInt32 typeCount);
+typedef TNC_Result (*TNC_TNCC_SendMessagePointer)(
+    TNC_IMCID imcID,
+    TNC_ConnectionID connectionID,
+    TNC_BufferReference message,
+    TNC_UInt32 messageLength,
+    TNC_MessageType messageType);
+typedef TNC_Result (*TNC_TNCC_RequestHandshakeRetryPointer)(
+    TNC_IMCID imcID,
+    TNC_ConnectionID connectionID,
+    TNC_RetryReason reason);
+typedef TNC_Result (*TNC_TNCC_BindFunctionPointer)(
+    TNC_IMCID imcID,
+    char *functionName,
+    void **pOutfunctionPointer);
+typedef TNC_Result (*TNC_IMC_ProvideBindFunctionPointer)(
+    TNC_IMCID imcID,
+    TNC_TNCC_BindFunctionPointer bindFunction);
+
+#define TNC_IFIMC_VERSION_1 1
+
+/* Handshake Retry Reason Values */
+
+#define TNC_RETRY_REASON_IMC_REMEDIATION_COMPLETE 0
+#define TNC_RETRY_REASON_IMC_SERIOUS_EVENT 1
+#define TNC_RETRY_REASON_IMC_INFORMATIONAL_EVENT 2
+#define TNC_RETRY_REASON_IMC_PERIODIC 3
+/* reserved for TNC_RETRY_REASON_IMV_IMPORTANT_POLICY_CHANGE: 4 */
+/* reserved for TNC_RETRY_REASON_IMV_MINOR_POLICY_CHANGE: 5 */
+/* reserved for TNC_RETRY_REASON_IMV_SERIOUS_EVENT: 6 */
+/* reserved for TNC_RETRY_REASON_IMV_MINOR_EVENT: 7 */
+/* reserved for TNC_RETRY_REASON_IMV_PERIODIC: 8 */
+
+/* IMC Functions */
+
+TNC_IMC_API TNC_Result TNC_IMC_Initialize(
+/*in*/  TNC_IMCID imcID,
+/*in*/  TNC_Version minVersion,
+/*in*/  TNC_Version maxVersion,
+/*out*/ TNC_Version *pOutActualVersion);
+
+TNC_IMC_API TNC_Result TNC_IMC_NotifyConnectionChange(
+/*in*/  TNC_IMCID imcID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_ConnectionState newState);
+
+TNC_IMC_API TNC_Result TNC_IMC_BeginHandshake(
+/*in*/  TNC_IMCID imcID,
+/*in*/  TNC_ConnectionID connectionID);
+
+TNC_IMC_API TNC_Result TNC_IMC_ReceiveMessage(
+/*in*/  TNC_IMCID imcID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_BufferReference messageBuffer,
+/*in*/  TNC_UInt32 messageLength,
+/*in*/  TNC_MessageType messageType);
+
+TNC_IMC_API TNC_Result TNC_IMC_BatchEnding(
+/*in*/  TNC_IMCID imcID,
+/*in*/  TNC_ConnectionID connectionID);
+
+TNC_IMC_API TNC_Result TNC_IMC_Terminate(
+/*in*/  TNC_IMCID imcID);
+
+TNC_IMC_API TNC_Result TNC_IMC_ProvideBindFunction(
+/*in*/  TNC_IMCID imcID,
+/*in*/  TNC_TNCC_BindFunctionPointer bindFunction);
+
+/* TNC Client Functions */
+
+TNC_Result TNC_TNCC_ReportMessageTypes(
+/*in*/  TNC_IMCID imcID,
+/*in*/  TNC_MessageTypeList supportedTypes,
+/*in*/  TNC_UInt32 typeCount);
+
+TNC_Result TNC_TNCC_SendMessage(
+/*in*/  TNC_IMCID imcID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_BufferReference message,
+/*in*/  TNC_UInt32 messageLength,
+/*in*/  TNC_MessageType messageType);
+
+TNC_Result TNC_TNCC_RequestHandshakeRetry(
+/*in*/  TNC_IMCID imcID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_RetryReason reason);
+
+TNC_Result TNC_TNCC_BindFunction(
+/*in*/  TNC_IMCID imcID,
+/*in*/  char *functionName,
+/*out*/ void **pOutfunctionPointer);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/libcharon/tnc/tncifimv.h b/src/libcharon/tnc/tncifimv.h
new file mode 100755 (executable)
index 0000000..251865e
--- /dev/null
@@ -0,0 +1,256 @@
+/* tncifimv.h
+ *
+ * Trusted Network Connect IF-IMV API version 1.20
+ * Microsoft Windows DLL Platform Binding C Header
+ * February 5, 2007
+ *
+ * Copyright(c) 2005-2007, Trusted Computing Group, Inc. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in
+ *   the documentation and/or other materials provided with the  
+ *   distribution.
+ * - Neither the name of the Trusted Computing Group nor the names of
+ *   its contributors may be used to endorse or promote products 
+ *   derived from this software without specific prior written 
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contact the Trusted Computing Group at 
+ * admin@trustedcomputinggroup.org for information on specification 
+ * licensing through membership agreements.
+ *
+ * Any marks and brands contained herein are the property of their 
+ * respective owners.
+ */
+
+#ifndef _TNCIFIMV_H
+#define _TNCIFIMV_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef WIN32
+#ifdef TNC_IMV_EXPORTS
+#define TNC_IMV_API __declspec(dllexport)
+#else
+#define TNC_IMV_API __declspec(dllimport)
+#endif
+#else
+#define TNC_IMV_API
+#endif
+
+#include "tncif.h"
+
+typedef TNC_UInt32 TNC_IMVID;
+typedef TNC_UInt32 TNC_IMV_Action_Recommendation;
+typedef TNC_UInt32 TNC_IMV_Evaluation_Result;
+typedef TNC_UInt32 TNC_AttributeID;
+
+
+/* Function pointers */
+
+typedef TNC_Result (*TNC_IMV_InitializePointer)(
+    TNC_IMVID imvID,
+    TNC_Version minVersion,
+    TNC_Version maxVersion,
+    TNC_Version *pOutActualVersion);
+typedef TNC_Result (*TNC_IMV_NotifyConnectionChangePointer)(
+    TNC_IMVID imvID,
+    TNC_ConnectionID connectionID,
+    TNC_ConnectionState newState);
+typedef TNC_Result (*TNC_IMV_ReceiveMessagePointer)(
+    TNC_IMVID imvID,
+    TNC_ConnectionID connectionID,
+    TNC_BufferReference message,
+    TNC_UInt32 messageLength,
+    TNC_MessageType messageType);
+typedef TNC_Result (*TNC_IMV_SolicitRecommendationPointer)(
+    TNC_IMVID imvID,
+    TNC_ConnectionID connectionID);
+typedef TNC_Result (*TNC_IMV_BatchEndingPointer)(
+    TNC_IMVID imvID,
+    TNC_ConnectionID connectionID);
+typedef TNC_Result (*TNC_IMV_TerminatePointer)(
+    TNC_IMVID imvID);
+typedef TNC_Result (*TNC_TNCS_ReportMessageTypesPointer)(
+    TNC_IMVID imvID,
+    TNC_MessageTypeList supportedTypes,
+    TNC_UInt32 typeCount);
+typedef TNC_Result (*TNC_TNCS_SendMessagePointer)(
+    TNC_IMVID imvID,
+    TNC_ConnectionID connectionID,
+    TNC_BufferReference message,
+    TNC_UInt32 messageLength,
+    TNC_MessageType messageType);
+typedef TNC_Result (*TNC_TNCS_RequestHandshakeRetryPointer)(
+    TNC_IMVID imvID,
+    TNC_ConnectionID connectionID,
+    TNC_RetryReason reason);
+typedef TNC_Result (*TNC_TNCS_ProvideRecommendationPointer)(
+    TNC_IMVID imvID,
+    TNC_ConnectionID connectionID,
+    TNC_IMV_Action_Recommendation recommendation,
+    TNC_IMV_Evaluation_Result evaluation);
+typedef TNC_Result (*TNC_TNCS_GetAttributePointer)(
+    TNC_IMVID imvID,
+TNC_ConnectionID connectionID,
+TNC_AttributeID attributeID,
+    TNC_UInt32 bufferLength,
+    TNC_BufferReference buffer,
+    TNC_UInt32 *pOutValueLength);
+typedef TNC_Result (*TNC_TNCS_SetAttributePointer)(
+    TNC_IMVID imvID,
+    TNC_ConnectionID connectionID,
+TNC_AttributeID attributeID,
+    TNC_UInt32 bufferLength,
+    TNC_BufferReference buffer);
+typedef TNC_Result (*TNC_TNCS_BindFunctionPointer)(
+    TNC_IMVID imvID,
+    char *functionName,
+    void **pOutfunctionPointer);
+typedef TNC_Result (*TNC_IMV_ProvideBindFunctionPointer)(
+    TNC_IMVID imvID,
+    TNC_TNCS_BindFunctionPointer bindFunction);
+
+/* Version Numbers */
+
+#define TNC_IFIMV_VERSION_1 1
+
+/* Handshake Retry Reason Values */
+
+/* reserved for TNC_RETRY_REASON_IMC_REMEDIATION_COMPLETE: 0 */
+/* reserved for TNC_RETRY_REASON_IMC_SERIOUS_EVENT: 1 */
+/* reserved for TNC_RETRY_REASON_IMC_INFORMATIONAL_EVENT: 2 */
+/* reserved for TNC_RETRY_REASON_IMC_PERIODIC: 3 */
+#define TNC_RETRY_REASON_IMV_IMPORTANT_POLICY_CHANGE 4
+#define TNC_RETRY_REASON_IMV_MINOR_POLICY_CHANGE 5
+#define TNC_RETRY_REASON_IMV_SERIOUS_EVENT 6
+#define TNC_RETRY_REASON_IMV_MINOR_EVENT 7
+#define TNC_RETRY_REASON_IMV_PERIODIC 8
+
+/* IMV Action Recommendation Values */
+
+#define TNC_IMV_ACTION_RECOMMENDATION_ALLOW 0
+#define TNC_IMV_ACTION_RECOMMENDATION_NO_ACCESS 1
+#define TNC_IMV_ACTION_RECOMMENDATION_ISOLATE 2
+#define TNC_IMV_ACTION_RECOMMENDATION_NO_RECOMMENDATION 3
+
+/* IMV Evaluation Result Values */
+
+#define TNC_IMV_EVALUATION_RESULT_COMPLIANT 0
+#define TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MINOR 1
+#define TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MAJOR 2
+#define TNC_IMV_EVALUATION_RESULT_ERROR 3
+#define TNC_IMV_EVALUATION_RESULT_DONT_KNOW 4
+
+/* Message Attribute ID Values */
+
+#define TNC_ATTRIBUTEID_PREFERRED_LANGUAGE ((TNC_AttributeID) 0x00000001)
+#define TNC_ATTRIBUTEID_REASON_STRING ((TNC_AttributeID) 0x00000002)
+#define TNC_ATTRIBUTEID_REASON_LANGUAGE ((TNC_AttributeID) 0x00000003)
+
+/* IMV Functions */
+
+TNC_IMV_API TNC_Result TNC_IMV_Initialize(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_Version minVersion,
+/*in*/  TNC_Version maxVersion,
+/*in*/  TNC_Version *pOutActualVersion);
+
+TNC_IMV_API TNC_Result TNC_IMV_NotifyConnectionChange(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_ConnectionState newState);
+
+TNC_IMV_API TNC_Result TNC_IMV_ReceiveMessage(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_BufferReference messageBuffer,
+/*in*/  TNC_UInt32 messageLength,
+/*in*/  TNC_MessageType messageType);
+
+TNC_IMV_API TNC_Result TNC_IMV_SolicitRecommendation(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_ConnectionID connectionID);
+
+TNC_IMV_API TNC_Result TNC_IMV_BatchEnding(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_ConnectionID connectionID);
+
+TNC_IMV_API TNC_Result TNC_IMV_Terminate(
+/*in*/  TNC_IMVID imvID);
+
+TNC_IMV_API TNC_Result TNC_IMV_ProvideBindFunction(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_TNCS_BindFunctionPointer bindFunction);
+
+/* TNC Server Functions */
+
+TNC_Result TNC_TNCS_ReportMessageTypes(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_MessageTypeList supportedTypes,
+/*in*/  TNC_UInt32 typeCount);
+
+TNC_Result TNC_TNCS_SendMessage(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_BufferReference message,
+/*in*/  TNC_UInt32 messageLength,
+/*in*/  TNC_MessageType messageType);
+
+TNC_Result TNC_TNCS_RequestHandshakeRetry(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_RetryReason reason);
+
+TNC_Result TNC_TNCS_ProvideRecommendation(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_IMV_Action_Recommendation recommendation,
+/*in*/  TNC_IMV_Evaluation_Result evaluation);
+
+TNC_Result TNC_TNCS_GetAttribute(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_AttributeID attributeID,
+/*in*/  TNC_UInt32 bufferLength,
+/*out*/ TNC_BufferReference buffer,
+/*out*/ TNC_UInt32 *pOutValueLength);
+
+TNC_Result TNC_TNCS_SetAttribute(
+/*in*/  TNC_IMVID imvID,
+/*in*/  TNC_ConnectionID connectionID,
+/*in*/  TNC_AttributeID attributeID,
+/*in*/  TNC_UInt32 bufferLength,
+/*in*/  TNC_BufferReference buffer);
+
+TNC_Result TNC_TNCS_BindFunction(
+/*in*/  TNC_IMVID imvID,
+/*in*/  char *functionName,
+/*in*/  void **pOutfunctionPointer);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/libcharon/tnccs/tnccs.c b/src/libcharon/tnccs/tnccs.c
deleted file mode 100644 (file)
index 2facf02..0000000
+++ /dev/null
@@ -1,22 +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.h"
-
-ENUM(eap_type_names, TNCCS_1_1, TNCCS_2_0,
-       "TNCCS 1.1",
-       "TNCCS SOH",
-       "TNCCS 2.0",
-);
diff --git a/src/libcharon/tnccs/tnccs.h b/src/libcharon/tnccs/tnccs.h
deleted file mode 100644 (file)
index 583512e..0000000
+++ /dev/null
@@ -1,52 +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 tnccs
- * @{ @ingroup libcharon
- */
-
-#ifndef TNCCS_H_
-#define TNCCS_H_
-
-typedef enum tnccs_type_t tnccs_type_t;
-
-#include <library.h>
-
-/**
- * Type of TNC Client/Server protocol
- */
-enum tnccs_type_t {
-       TNCCS_1_1,
-       TNCCS_SOH,
-       TNCCS_2_0
-};
-
-/**
- * enum names for tnccs_type_t.
- */
-extern enum_name_t *tnccs_type_names;
-
-typedef struct tnccs_t tnccs_t;
-
-/**
- * Constructor definition for a pluggable TNCCS protocol implementation.
- *
- * @param is_server            TRUE if TNC Server, FALSE if TNC Client
- * @return                             implementation of the tnccs_t interface
- */
-typedef tnccs_t* (*tnccs_constructor_t)(bool is_server);
-
-#endif /** TNC_H_ @}*/
diff --git a/src/libcharon/tnccs/tnccs_manager.c b/src/libcharon/tnccs/tnccs_manager.c
deleted file mode 100644 (file)
index 0fd6737..0000000
+++ /dev/null
@@ -1,148 +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_manager.h"
-
-#include <utils/linked_list.h>
-#include <threading/rwlock.h>
-
-typedef struct private_tnccs_manager_t private_tnccs_manager_t;
-typedef struct tnccs_entry_t tnccs_entry_t;
-
-/**
- * TNCCS constructor entry
- */
-struct tnccs_entry_t {
-
-       /**
-        * TNCCS protocol type
-        */
-       tnccs_type_t type;
-
-       /**
-        * constructor function to create instance
-        */
-       tnccs_constructor_t constructor;
-};
-
-/**
- * private data of tnccs_manager
- */
-struct private_tnccs_manager_t {
-
-       /**
-        * public functions
-        */
-       tnccs_manager_t public;
-
-       /**
-        * list of tnccs_entry_t's
-        */
-       linked_list_t *protocols;
-
-       /**
-        * rwlock to lock methods
-        */
-       rwlock_t *lock;
-};
-
-METHOD(tnccs_manager_t, add_method, void,
-       private_tnccs_manager_t *this, tnccs_type_t type,
-       tnccs_constructor_t constructor)
-{
-       tnccs_entry_t *entry = malloc_thing(tnccs_entry_t);
-
-       entry->type = type;
-       entry->constructor = constructor;
-
-       this->lock->write_lock(this->lock);
-       this->protocols->insert_last(this->protocols, entry);
-       this->lock->unlock(this->lock);
-}
-
-METHOD(tnccs_manager_t, remove_method, void,
-       private_tnccs_manager_t *this, tnccs_constructor_t constructor)
-{
-       enumerator_t *enumerator;
-       tnccs_entry_t *entry;
-
-       this->lock->write_lock(this->lock);
-       enumerator = this->protocols->create_enumerator(this->protocols);
-       while (enumerator->enumerate(enumerator, &entry))
-       {
-               if (constructor == entry->constructor)
-               {
-                       this->protocols->remove_at(this->protocols, enumerator);
-                       free(entry);
-               }
-       }
-       enumerator->destroy(enumerator);
-       this->lock->unlock(this->lock);
-}
-
-METHOD(tnccs_manager_t, create_instance, tnccs_t*,
-       private_tnccs_manager_t *this, tnccs_type_t type, bool is_server)
-{
-       enumerator_t *enumerator;
-       tnccs_entry_t *entry;
-       tnccs_t *protocol = NULL;
-
-       this->lock->read_lock(this->lock);
-       enumerator = this->protocols->create_enumerator(this->protocols);
-       while (enumerator->enumerate(enumerator, &entry))
-       {
-               if (type == entry->type)
-               {
-                       protocol = entry->constructor(is_server);
-                       if (protocol)
-                       {
-                               break;
-                       }
-               }
-       }
-       enumerator->destroy(enumerator);
-       this->lock->unlock(this->lock);
-       return protocol;
-}
-
-METHOD(tnccs_manager_t, destroy, void,
-       private_tnccs_manager_t *this)
-{
-       this->protocols->destroy_function(this->protocols, free);
-       this->lock->destroy(this->lock);
-       free(this);
-}
-
-/*
- * See header
- */
-tnccs_manager_t *tnccs_manager_create()
-{
-       private_tnccs_manager_t *this;
-
-       INIT(this,
-                       .public = {
-                               .add_method = _add_method,
-                               .remove_method = _remove_method,
-                               .create_instance = _create_instance,
-                               .destroy = _destroy,
-                       },
-                       .protocols = linked_list_create(),
-                       .lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
-       );
-
-       return &this->public;
-}
-
diff --git a/src/libcharon/tnccs/tnccs_manager.h b/src/libcharon/tnccs/tnccs_manager.h
deleted file mode 100644 (file)
index 2f4a961..0000000
+++ /dev/null
@@ -1,74 +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_manager tnccs_manager
- * @{ @ingroup tnccs
- */
-
-#ifndef TNCCS_MANAGER_H_
-#define TNCCS_MANAGER_H_
-
-#include "tnccs.h"
-
-typedef struct tnccs_manager_t tnccs_manager_t;
-
-/**
- * The TNCCS manager manages all TNCCS implementations and creates instances.
- *
- * A plugin registers its implemented TNCCS protocol with the manager by
- * providing type and a constructor function. The manager then creates
- * TNCCS protocol instances via the provided constructor.
- */
-struct tnccs_manager_t {
-
-       /**
-        * Register a TNCCS protocol implementation.
-        *
-        * @param type                  TNCCS protocol type
-        * @param constructor   constructor, returns a TNCCS protocol implementation
-        */
-       void (*add_method)(tnccs_manager_t *this, tnccs_type_t type,
-                                          tnccs_constructor_t constructor);
-
-       /**
-        * Unregister a TNCCS protocol implementation using it's constructor.
-        *
-        * @param constructor   constructor function to remove, as added in add_method
-        */
-       void (*remove_method)(tnccs_manager_t *this, tnccs_constructor_t constructor);
-
-       /**
-        * Create a new TNCCS protocol instance.
-        *
-        * @param type                  type of the TNCCS protocol
-        * @param is_server             TRUE if TNC Server, FALSE if TNC Client
-        * @return                              TNCCS protocol instance, NULL if no constructor found
-        */
-       tnccs_t* (*create_instance)(tnccs_manager_t *this, tnccs_type_t type,
-                                                               bool is_server);
-
-       /**
-        * Destroy a tnccs_manager instance.
-        */
-       void (*destroy)(tnccs_manager_t *this);
-};
-
-/**
- * Create a tnccs_manager instance.
- */
-tnccs_manager_t *tnccs_manager_create();
-
-#endif /** TNCCS_MANAGER_H_ @}*/
index 5673fc3..8c3171d 100644 (file)
@@ -218,6 +218,8 @@ char *whitelist[] = {
        "gcry_create_nonce",
        /* NSPR */
        "PR_CallOnce",
+       /* libapr */
+       "apr_pool_create_ex",
 };
 
 /**