ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

implemented dynamic detection of TNCCS protocol

This commit is contained in:
Andreas Steffen 2011-01-31 00:59:01 +01:00
parent 5c89a00f05
commit f652995b21
10 changed files with 317 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -122,6 +122,7 @@ ARG_ENABL_SET([tnc-imc], [enable TNC IMC module.])
ARG_ENABL_SET([tnc-imv], [enable TNC IMV module.])
ARG_ENABL_SET([tnccs-11], [enable TNCCS 1.1 protocol module.])
ARG_ENABL_SET([tnccs-20], [enable TNCCS 2.0 protocol module.])
ARG_ENABL_SET([tnccs-dynamic], [enable dynamic TNCCS protocol discovery module.])
ARG_DISBL_SET([kernel-netlink], [disable the netlink kernel interface.])
ARG_ENABL_SET([kernel-pfkey], [enable the PF_KEY kernel interface.])
ARG_ENABL_SET([kernel-pfroute], [enable the PF_ROUTE kernel interface.])
@ -764,6 +765,7 @@ ADD_PLUGIN([eap-ttls], [c libcharon])
ADD_PLUGIN([eap-tnc], [c libcharon])
ADD_PLUGIN([tnccs-20], [c libcharon])
ADD_PLUGIN([tnccs-11], [c libcharon])
ADD_PLUGIN([tnccs-dynamic], [c libcharon])
ADD_PLUGIN([tnc-imc], [c libcharon])
ADD_PLUGIN([tnc-imv], [c libcharon])
ADD_PLUGIN([medsrv], [c libcharon])
@ -871,6 +873,7 @@ AM_CONDITIONAL(USE_TNC_IMC, test x$tnc_imc = xtrue)
AM_CONDITIONAL(USE_TNC_IMV, test x$tnc_imv = xtrue)
AM_CONDITIONAL(USE_TNCCS_11, test x$tnccs_11 = xtrue)
AM_CONDITIONAL(USE_TNCCS_20, test x$tnccs_20 = xtrue)
AM_CONDITIONAL(USE_TNCCS_DYNAMIC, test x$tnccs_dynamic = xtrue)
AM_CONDITIONAL(USE_SOCKET_DEFAULT, test x$socket_default = xtrue)
AM_CONDITIONAL(USE_SOCKET_RAW, test x$socket_raw = xtrue)
AM_CONDITIONAL(USE_SOCKET_DYNAMIC, test x$socket_dynamic = xtrue)
@ -1018,6 +1021,7 @@ AC_OUTPUT(
src/libcharon/plugins/tnc_imv/Makefile
src/libcharon/plugins/tnccs_11/Makefile
src/libcharon/plugins/tnccs_20/Makefile
src/libcharon/plugins/tnccs_dynamic/Makefile
src/libcharon/plugins/socket_default/Makefile
src/libcharon/plugins/socket_raw/Makefile
src/libcharon/plugins/socket_dynamic/Makefile

7
src/libcharon/Makefile.am
View File

@ -347,6 +347,13 @@ if MONOLITHIC
endif
endif
if USE_TNCCS_DYNAMIC
SUBDIRS += plugins/tnccs_dynamic
if MONOLITHIC
libcharon_la_LIBADD += plugins/tnccs_dynamic/libstrongswan-tnccs-dynamic.la
endif
endif
if USE_MEDSRV
SUBDIRS += plugins/medsrv
if MONOLITHIC

21
src/libcharon/plugins/eap_tnc/eap_tnc.c
View File

@ -18,7 +18,7 @@
#include <tls_eap.h>
#include <daemon.h>
#include <library.h>
#include <debug.h>
typedef struct private_eap_tnc_t private_eap_tnc_t;
@ -137,7 +137,24 @@ static eap_tnc_t *eap_tnc_create(identification_t *server,
"charon.plugins.eap-tnc.max_message_count", MAX_MESSAGE_COUNT);
protocol = lib->settings->get_str(lib->settings,
"charon.plugins.eap-tnc.protocol", "tnccs-1.1");
type = strcaseeq(protocol, "tnccs-2.0") ? TNCCS_2_0 : TNCCS_1_1;
if (strcaseeq(protocol, "tnccs-2.0"))
{
type = TNCCS_2_0;
}
else if (strcaseeq(protocol, "tnccs-1.1"))
{
type = TNCCS_1_1;
}
else if (strcaseeq(protocol, "tnccs-dynamic") && is_server)
{
type = TNCCS_DYNAMIC;
}
else
{
DBG1(DBG_TNC, "TNCCS protocol '%s' not supported", protocol);
free(this);
return NULL;
}
tnccs = charon->tnccs->create_instance(charon->tnccs, type, is_server);
this->tls_eap = tls_eap_create(EAP_TNC, (tls_t*)tnccs, frag_size, max_msg_count);
if (!this->tls_eap)

17
src/libcharon/plugins/tnccs_dynamic/Makefile.am Normal file
View File

@ -0,0 +1,17 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libtls
AM_CFLAGS = -rdynamic
if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-tnccs-dynamic.la
else
plugin_LTLIBRARIES = libstrongswan-tnccs-dynamic.la
libstrongswan_tnccs_dynamic_la_LIBADD = $(top_builddir)/src/libtls/libtls.la
endif
libstrongswan_tnccs_dynamic_la_SOURCES = \
tnccs_dynamic_plugin.h tnccs_dynamic_plugin.c tnccs_dynamic.h tnccs_dynamic.c
libstrongswan_tnccs_dynamic_la_LDFLAGS = -module -avoid-version

140
src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c Normal file
View File

@ -0,0 +1,140 @@
/*
* Copyright (C) 2011 Andreas Steffen
* HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "tnccs_dynamic.h"
#include <tnc/tnccs/tnccs.h>
#include <daemon.h>
typedef struct private_tnccs_dynamic_t private_tnccs_dynamic_t;
/**
* Private data of a tnccs_dynamic_t object.
*/
struct private_tnccs_dynamic_t {
/**
* Public tls_t interface.
*/
tls_t public;
/**
* Detected TNC IF-TNCCS stack
*/
tls_t *tls;
};
tnccs_type_t determine_tnccs_protocol(char version)
{
switch (version)
{
case '\t':
case '\n':
case '\r':
case ' ':
case '<':
return TNCCS_1_1;
case 0x00:
return TNCCS_SOH;
case 0x02:
return TNCCS_2_0;
default:
return TNCCS_UNKNOWN;
}
}
METHOD(tls_t, process, status_t,
private_tnccs_dynamic_t *this, void *buf, size_t buflen)
{
tnccs_type_t type;
if (!this->tls)
{
if (buflen == 0)
{
return FAILED;
}
type = determine_tnccs_protocol(*(char*)buf);
DBG1(DBG_TNC, "%N protocol detected dynamically",
tnccs_type_names, type);
this->tls = (tls_t*)charon->tnccs->create_instance(charon->tnccs,
type, TRUE);
if (!this->tls)
{
DBG1(DBG_TNC, "N% protocol not supported", tnccs_type_names, type);
return FAILED;
}
}
return this->tls->process(this->tls, buf, buflen);
}
METHOD(tls_t, build, status_t,
private_tnccs_dynamic_t *this, void *buf, size_t *buflen, size_t *msglen)
{
return this->tls->build(this->tls, buf, buflen, msglen);
}
METHOD(tls_t, is_server, bool,
private_tnccs_dynamic_t *this)
{
return TRUE;
}
METHOD(tls_t, get_purpose, tls_purpose_t,
private_tnccs_dynamic_t *this)
{
return TLS_PURPOSE_EAP_TNC;
}
METHOD(tls_t, is_complete, bool,
private_tnccs_dynamic_t *this)
{
return this->tls ? this->tls->is_complete(this->tls) : FALSE;
}
METHOD(tls_t, get_eap_msk, chunk_t,
private_tnccs_dynamic_t *this)
{
return chunk_empty;
}
METHOD(tls_t, destroy, void,
private_tnccs_dynamic_t *this)
{
DESTROY_IF(this->tls);
free(this);
}
/**
* See header
*/
tls_t *tnccs_dynamic_create(bool is_server)
{
private_tnccs_dynamic_t *this;
INIT(this,
.public = {
.process = _process,
.build = _build,
.is_server = _is_server,
.get_purpose = _get_purpose,
.is_complete = _is_complete,
.get_eap_msk = _get_eap_msk,
.destroy = _destroy,
},
);
return &this->public;
}

36
src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.h Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright (C) 2011 Andreas Steffen
* HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
/**
* @defgroup tnccs_dynamic_h tnccs_dynamic
* @{ @ingroup tnccs_dynamic
*/
#ifndef TNCCS_DYNAMIC_H_
#define TNCCS_DYNAMIC_H_
#include <library.h>
#include <tls.h>
/**
* Create an instance of a dynamic TNC IF-TNCCS protocol handler.
*
* @param is_server TRUE to act as TNC Server, FALSE for TNC Client
* @return dynamic TNC IF-TNCCS protocol stack
*/
tls_t *tnccs_dynamic_create(bool is_server);
#endif /** TNCCS_DYNAMIC_H_ @}*/

47
src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic_plugin.c Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright (C) 2011 Andreas Steffen
* HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "tnccs_dynamic_plugin.h"
#include "tnccs_dynamic.h"
#include <daemon.h>
METHOD(plugin_t, destroy, void,
tnccs_dynamic_plugin_t *this)
{
charon->tnccs->remove_method(charon->tnccs,
(tnccs_constructor_t)tnccs_dynamic_create);
free(this);
}
/*
* see header file
*/
plugin_t *tnccs_dynamic_plugin_create()
{
tnccs_dynamic_plugin_t *this;
INIT(this,
.plugin = {
.destroy = _destroy,
},
);
charon->tnccs->add_method(charon->tnccs, TNCCS_DYNAMIC,
(tnccs_constructor_t)tnccs_dynamic_create);
return &this->plugin;
}

42
src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic_plugin.h Normal file
View File

@ -0,0 +1,42 @@
/*
* Copyright (C) 2011 Andreas Steffen
* HSR Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
/**
* @defgroup tnccs_dynamic tnccs_dynamic
* @ingroup cplugins
*
* @defgroup tnccs_dynamic_plugin tnccs_dynamic_plugin
* @{ @ingroup tnccs_dynamic
*/
#ifndef TNCCS_DYNAMIC_PLUGIN_H_
#define TNCCS_DYNAMIC_PLUGIN_H_
#include <plugins/plugin.h>
typedef struct tnccs_dynamic_plugin_t tnccs_dynamic_plugin_t;
/**
* EAP-TNC plugin
*/
struct tnccs_dynamic_plugin_t {
/**
* implements plugin interface
*/
plugin_t plugin;
};
#endif /** TNCCS_DYNAMIC_PLUGIN_H_ @}*/

3
src/libcharon/tnc/tnccs/tnccs.c
View File

@ -15,7 +15,8 @@
#include "tnccs.h"
ENUM(eap_type_names, TNCCS_1_1, TNCCS_2_0,
ENUM(tnccs_type_names, TNCCS_UNKNOWN, TNCCS_2_0,
"unknown TNCCS",
"TNCCS 1.1",
"TNCCS SOH",
"TNCCS 2.0",

4
src/libcharon/tnc/tnccs/tnccs.h
View File

@ -39,9 +39,11 @@ typedef enum tnccs_type_t tnccs_type_t;
* Type of TNC Client/Server protocol
*/
enum tnccs_type_t {
TNCCS_UNKNOWN,
TNCCS_1_1,
TNCCS_SOH,
TNCCS_2_0
TNCCS_2_0,
TNCCS_DYNAMIC
};
/**