Moved tnc-tnccs, tnc-imc, tnccs-11, tnccs-20 and tnccs-dynamic libcharon plugins to libtnccs
This commit is contained in:
parent
180a2f2642
commit
e8f65c5cde
25
configure.ac
25
configure.ac
|
@ -969,10 +969,11 @@ nm_plugins=
|
|||
cmd_plugins=
|
||||
|
||||
# location specific lists for checksumming,
|
||||
# for src/libcharon, src/libhydra and src/libstrongswan
|
||||
# for src/libcharon, src/libhydra, src/libstrongswan and src/libtnccs
|
||||
c_plugins=
|
||||
h_plugins=
|
||||
s_plugins=
|
||||
t_plugins=
|
||||
|
||||
ADD_PLUGIN([test-vectors], [s charon openac scepclient pki])
|
||||
ADD_PLUGIN([curl], [s charon scepclient scripts nm cmd])
|
||||
|
@ -1060,12 +1061,12 @@ ADD_PLUGIN([xauth-pam], [c charon])
|
|||
ADD_PLUGIN([xauth-noauth], [c charon])
|
||||
ADD_PLUGIN([tnc-ifmap], [c charon])
|
||||
ADD_PLUGIN([tnc-pdp], [c charon])
|
||||
ADD_PLUGIN([tnc-imc], [c charon])
|
||||
ADD_PLUGIN([tnc-imc], [t charon])
|
||||
ADD_PLUGIN([tnc-imv], [c charon])
|
||||
ADD_PLUGIN([tnc-tnccs], [c charon])
|
||||
ADD_PLUGIN([tnccs-20], [c charon])
|
||||
ADD_PLUGIN([tnccs-11], [c charon])
|
||||
ADD_PLUGIN([tnccs-dynamic], [c charon])
|
||||
ADD_PLUGIN([tnc-tnccs], [t charon])
|
||||
ADD_PLUGIN([tnccs-20], [t charon])
|
||||
ADD_PLUGIN([tnccs-11], [t charon])
|
||||
ADD_PLUGIN([tnccs-dynamic], [t charon])
|
||||
ADD_PLUGIN([medsrv], [c charon])
|
||||
ADD_PLUGIN([medcli], [c charon])
|
||||
ADD_PLUGIN([dhcp], [c charon])
|
||||
|
@ -1104,6 +1105,7 @@ AC_SUBST(cmd_plugins)
|
|||
AC_SUBST(c_plugins)
|
||||
AC_SUBST(h_plugins)
|
||||
AC_SUBST(s_plugins)
|
||||
AC_SUBST(t_plugins)
|
||||
|
||||
# ======================
|
||||
# set Makefile.am vars
|
||||
|
@ -1374,6 +1376,11 @@ AC_CONFIG_FILES([
|
|||
src/libradius/Makefile
|
||||
src/libtncif/Makefile
|
||||
src/libtnccs/Makefile
|
||||
src/libtnccs/plugins/tnc_tnccs/Makefile
|
||||
src/libtnccs/plugins/tnc_imc/Makefile
|
||||
src/libtnccs/plugins/tnccs_11/Makefile
|
||||
src/libtnccs/plugins/tnccs_20/Makefile
|
||||
src/libtnccs/plugins/tnccs_dynamic/Makefile
|
||||
src/libpttls/Makefile
|
||||
src/libpts/Makefile
|
||||
src/libpts/plugins/imc_attestation/Makefile
|
||||
|
@ -1414,12 +1421,7 @@ AC_CONFIG_FILES([
|
|||
src/libcharon/plugins/xauth_noauth/Makefile
|
||||
src/libcharon/plugins/tnc_ifmap/Makefile
|
||||
src/libcharon/plugins/tnc_pdp/Makefile
|
||||
src/libcharon/plugins/tnc_imc/Makefile
|
||||
src/libcharon/plugins/tnc_imv/Makefile
|
||||
src/libcharon/plugins/tnc_tnccs/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_dynamic/Makefile
|
||||
src/libcharon/plugins/farp/Makefile
|
||||
|
@ -1484,4 +1486,5 @@ AC_MSG_RESULT([-----------------------------------------------------])
|
|||
AC_MSG_RESULT([libstrongswan:$s_plugins])
|
||||
AC_MSG_RESULT([libcharon: $c_plugins])
|
||||
AC_MSG_RESULT([libhydra: $h_plugins])
|
||||
AC_MSG_RESULT([libtnccs: $t_plugins])
|
||||
AC_MSG_RESULT([])
|
||||
|
|
|
@ -57,9 +57,17 @@ if USE_RADIUS
|
|||
libs += $(DESTDIR)$(ipseclibdir)/libradius.so
|
||||
endif
|
||||
|
||||
if USE_LIBPTTLS
|
||||
deps += $(top_builddir)/src/libpttls/libpttls.la
|
||||
libs += $(DESTDIR)$(ipseclibdir)/libpttls.so
|
||||
endif
|
||||
|
||||
if USE_LIBTNCCS
|
||||
deps += $(top_builddir)/src/libtnccs/libtnccs.la
|
||||
libs += $(DESTDIR)$(ipseclibdir)/libtnccs.so
|
||||
if !MONOLITHIC
|
||||
AM_CPPFLAGS += -DT_PLUGINS=\""${t_plugins}\""
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_SIMAKA
|
||||
|
|
|
@ -165,8 +165,8 @@ int main(int argc, char* argv[])
|
|||
#ifdef H_PLUGINS
|
||||
build_plugin_checksums(H_PLUGINS);
|
||||
#endif
|
||||
#ifdef P_PLUGINS
|
||||
build_plugin_checksums(P_PLUGINS);
|
||||
#ifdef T_PLUGINS
|
||||
build_plugin_checksums(T_PLUGINS);
|
||||
#endif
|
||||
#ifdef C_PLUGINS
|
||||
build_plugin_checksums(C_PLUGINS);
|
||||
|
|
|
@ -385,13 +385,6 @@ if MONOLITHIC
|
|||
endif
|
||||
endif
|
||||
|
||||
if USE_TNC_IMC
|
||||
SUBDIRS += plugins/tnc_imc
|
||||
if MONOLITHIC
|
||||
libcharon_la_LIBADD += plugins/tnc_imc/libstrongswan-tnc-imc.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_TNC_IMV
|
||||
SUBDIRS += plugins/tnc_imv
|
||||
if MONOLITHIC
|
||||
|
@ -399,34 +392,6 @@ if MONOLITHIC
|
|||
endif
|
||||
endif
|
||||
|
||||
if USE_TNC_TNCCS
|
||||
SUBDIRS += plugins/tnc_tnccs
|
||||
if MONOLITHIC
|
||||
libcharon_la_LIBADD += plugins/tnc_tnccs/libstrongswan-tnc-tnccs.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_TNCCS_11
|
||||
SUBDIRS += plugins/tnccs_11
|
||||
if MONOLITHIC
|
||||
libcharon_la_LIBADD += plugins/tnccs_11/libstrongswan-tnccs-11.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_TNCCS_20
|
||||
SUBDIRS += plugins/tnccs_20
|
||||
if MONOLITHIC
|
||||
libcharon_la_LIBADD += plugins/tnccs_20/libstrongswan-tnccs-20.la
|
||||
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_LIBTNCCS
|
||||
if MONOLITHIC
|
||||
# otherwise this library is linked to the respective plugins
|
||||
|
|
|
@ -17,6 +17,14 @@
|
|||
|
||||
#include <utils/debug.h>
|
||||
|
||||
/**
|
||||
* Described in header.
|
||||
*/
|
||||
void libpttls_init(void)
|
||||
{
|
||||
/* empty */
|
||||
}
|
||||
|
||||
/*
|
||||
* PT-TNC Message format:
|
||||
* 1 2 3
|
||||
|
|
|
@ -111,4 +111,13 @@ bio_reader_t* pt_tls_read(tls_socket_t *tls, u_int32_t *vendor,
|
|||
bool pt_tls_write(tls_socket_t *tls, bio_writer_t *writer,
|
||||
pt_tls_message_type_t type, u_int32_t identifier);
|
||||
|
||||
/**
|
||||
* @}
|
||||
* @addtogroup libpttls
|
||||
* @{
|
||||
*
|
||||
* Dummy libpttls initialization function needed for integrity test
|
||||
*/
|
||||
void libpttls_init(void);
|
||||
|
||||
#endif /** PT_TLS_H_ @}*/
|
||||
|
|
|
@ -16,3 +16,49 @@ tnc/tnccs/tnccs.h tnc/tnccs/tnccs.c \
|
|||
tnc/tnccs/tnccs_manager.h tnc/tnccs/tnccs_manager.c
|
||||
|
||||
EXTRA_DIST = Android.mk
|
||||
|
||||
# build optional plugins
|
||||
########################
|
||||
|
||||
if MONOLITHIC
|
||||
SUBDIRS =
|
||||
else
|
||||
SUBDIRS = .
|
||||
endif
|
||||
|
||||
if USE_TNC_TNCCS
|
||||
SUBDIRS += plugins/tnc_tnccs
|
||||
if MONOLITHIC
|
||||
libtnccs_la_LIBADD += plugins/tnc_tnccs/libstrongswan-tnc-tnccs.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_TNC_IMC
|
||||
SUBDIRS += plugins/tnc_imc
|
||||
if MONOLITHIC
|
||||
libtnccs_la_LIBADD += plugins/tnc_imc/libstrongswan-tnc-imc.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_TNCCS_11
|
||||
SUBDIRS += plugins/tnccs_11
|
||||
if MONOLITHIC
|
||||
libtnccs_la_LIBADD += plugins/tnccs_11/libstrongswan-tnccs-11.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_TNCCS_20
|
||||
SUBDIRS += plugins/tnccs_20
|
||||
if MONOLITHIC
|
||||
libtnccs_la_LIBADD += plugins/tnccs_20/libstrongswan-tnccs-20.la
|
||||
endif
|
||||
endif
|
||||
|
||||
if USE_TNCCS_DYNAMIC
|
||||
SUBDIRS += plugins/tnccs_dynamic
|
||||
if MONOLITHIC
|
||||
libtnccs_la_LIBADD += plugins/tnccs_dynamic/libstrongswan-tnccs-dynamic.la
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/libstrongswan \
|
||||
-I$(top_srcdir)/src/libhydra \
|
||||
-I$(top_srcdir)/src/libcharon \
|
||||
-I$(top_srcdir)/src/libtncif \
|
||||
-I$(top_srcdir)/src/libtnccs \
|
||||
-I$(top_srcdir)/src/libtls
|
|
@ -303,7 +303,7 @@ METHOD(imc_t, destroy, void,
|
|||
private_tnc_imc_t *this)
|
||||
{
|
||||
if (this->handle && lib->settings->get_bool(lib->settings,
|
||||
"%s.plugins.tnc-imc.dlclose", TRUE, "charon"))
|
||||
"libtnccs.plugins.tnc-imc.dlclose", TRUE))
|
||||
{
|
||||
dlclose(this->handle);
|
||||
}
|
|
@ -224,7 +224,7 @@ METHOD(imc_manager_t, get_preferred_language, char*,
|
|||
private_tnc_imc_manager_t *this)
|
||||
{
|
||||
return lib->settings->get_str(lib->settings,
|
||||
"%s.plugins.tnc-imc.preferred_language", "en", "charon");
|
||||
"libtnccs.plugins.tnc-imc.preferred_language", "en");
|
||||
}
|
||||
|
||||
METHOD(imc_manager_t, notify_connection_change, void,
|
|
@ -1,7 +1,5 @@
|
|||
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
|
|
@ -32,7 +32,6 @@
|
|||
#include <tnc/tnccs/tnccs_manager.h>
|
||||
|
||||
#include <utils/debug.h>
|
||||
#include <daemon.h>
|
||||
#include <threading/mutex.h>
|
||||
|
||||
typedef struct private_tnccs_11_t private_tnccs_11_t;
|
||||
|
@ -625,8 +624,7 @@ tnccs_t* tnccs_11_create(bool is_server,
|
|||
.transport = transport,
|
||||
.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
|
||||
.max_msg_len = lib->settings->get_int(lib->settings,
|
||||
"%s.plugins.tnccs-11.max_message_size", 45000,
|
||||
charon->name),
|
||||
"libtnccs.plugins.tnccs-11.max_message_size", 45000),
|
||||
);
|
||||
|
||||
return &this->public;
|
|
@ -1,7 +1,5 @@
|
|||
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
|
|
@ -932,11 +932,9 @@ tnccs_t* tnccs_20_create(bool 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"),
|
||||
"libtnccs.plugins.tnccs-20.max_batch_size", 65522),
|
||||
.max_msg_len = lib->settings->get_int(lib->settings,
|
||||
"%s.plugins.tnccs-20.max_message_size", 65490,
|
||||
"charon"),
|
||||
"libtnccs.plugins.tnccs-20.max_message_size", 65490),
|
||||
);
|
||||
|
||||
return &this->public;
|
Loading…
Reference in New Issue