From e8f65c5cdee4e04bf898f49e07d783ae6b3441aa Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Thu, 8 Aug 2013 11:02:17 +0200 Subject: [PATCH] Moved tnc-tnccs, tnc-imc, tnccs-11, tnccs-20 and tnccs-dynamic libcharon plugins to libtnccs --- configure.ac | 25 +++++----- src/checksum/Makefile.am | 8 ++++ src/checksum/checksum_builder.c | 4 +- src/libcharon/Makefile.am | 35 -------------- src/libpttls/pt_tls.c | 8 ++++ src/libpttls/pt_tls.h | 9 ++++ src/libtnccs/Makefile.am | 46 +++++++++++++++++++ .../plugins/tnc_imc/Makefile.am | 2 - .../plugins/tnc_imc/tnc_imc.c | 2 +- .../plugins/tnc_imc/tnc_imc.h | 0 .../plugins/tnc_imc/tnc_imc_bind_function.c | 0 .../plugins/tnc_imc/tnc_imc_manager.c | 2 +- .../plugins/tnc_imc/tnc_imc_manager.h | 0 .../plugins/tnc_imc/tnc_imc_plugin.c | 0 .../plugins/tnc_imc/tnc_imc_plugin.h | 0 .../plugins/tnc_tnccs/Makefile.am | 0 .../plugins/tnc_tnccs/tnc_tnccs_manager.c | 0 .../plugins/tnc_tnccs/tnc_tnccs_manager.h | 0 .../plugins/tnc_tnccs/tnc_tnccs_plugin.c | 0 .../plugins/tnc_tnccs/tnc_tnccs_plugin.h | 0 .../plugins/tnccs_11/Makefile.am | 2 - .../plugins/tnccs_11/batch/tnccs_batch.c | 0 .../plugins/tnccs_11/batch/tnccs_batch.h | 0 .../plugins/tnccs_11/messages/imc_imv_msg.c | 0 .../plugins/tnccs_11/messages/imc_imv_msg.h | 0 .../tnccs_11/messages/tnccs_error_msg.c | 0 .../tnccs_11/messages/tnccs_error_msg.h | 0 .../plugins/tnccs_11/messages/tnccs_msg.c | 0 .../plugins/tnccs_11/messages/tnccs_msg.h | 0 .../messages/tnccs_preferred_language_msg.c | 0 .../messages/tnccs_preferred_language_msg.h | 0 .../messages/tnccs_reason_strings_msg.c | 0 .../messages/tnccs_reason_strings_msg.h | 0 .../messages/tnccs_recommendation_msg.c | 0 .../messages/tnccs_recommendation_msg.h | 0 .../messages/tnccs_tncs_contact_info_msg.c | 0 .../messages/tnccs_tncs_contact_info_msg.h | 0 .../plugins/tnccs_11/tnccs_11.c | 4 +- .../plugins/tnccs_11/tnccs_11.h | 0 .../plugins/tnccs_11/tnccs_11_plugin.c | 0 .../plugins/tnccs_11/tnccs_11_plugin.h | 0 .../plugins/tnccs_20/Makefile.am | 2 - .../plugins/tnccs_20/batch/pb_tnc_batch.c | 0 .../plugins/tnccs_20/batch/pb_tnc_batch.h | 0 .../messages/pb_access_recommendation_msg.c | 0 .../messages/pb_access_recommendation_msg.h | 0 .../messages/pb_assessment_result_msg.c | 0 .../messages/pb_assessment_result_msg.h | 0 .../plugins/tnccs_20/messages/pb_error_msg.c | 0 .../plugins/tnccs_20/messages/pb_error_msg.h | 0 .../tnccs_20/messages/pb_experimental_msg.c | 0 .../tnccs_20/messages/pb_experimental_msg.h | 0 .../messages/pb_language_preference_msg.c | 0 .../messages/pb_language_preference_msg.h | 0 .../plugins/tnccs_20/messages/pb_pa_msg.c | 0 .../plugins/tnccs_20/messages/pb_pa_msg.h | 0 .../tnccs_20/messages/pb_reason_string_msg.c | 0 .../tnccs_20/messages/pb_reason_string_msg.h | 0 .../messages/pb_remediation_parameters_msg.c | 0 .../messages/pb_remediation_parameters_msg.h | 0 .../plugins/tnccs_20/messages/pb_tnc_msg.c | 0 .../plugins/tnccs_20/messages/pb_tnc_msg.h | 0 .../state_machine/pb_tnc_state_machine.c | 0 .../state_machine/pb_tnc_state_machine.h | 0 .../plugins/tnccs_20/tnccs_20.c | 6 +-- .../plugins/tnccs_20/tnccs_20.h | 0 .../plugins/tnccs_20/tnccs_20_plugin.c | 0 .../plugins/tnccs_20/tnccs_20_plugin.h | 0 .../plugins/tnccs_dynamic/Makefile.am | 0 .../plugins/tnccs_dynamic/tnccs_dynamic.c | 0 .../plugins/tnccs_dynamic/tnccs_dynamic.h | 0 .../tnccs_dynamic/tnccs_dynamic_plugin.c | 0 .../tnccs_dynamic/tnccs_dynamic_plugin.h | 0 73 files changed, 92 insertions(+), 63 deletions(-) rename src/{libcharon => libtnccs}/plugins/tnc_imc/Makefile.am (90%) rename src/{libcharon => libtnccs}/plugins/tnc_imc/tnc_imc.c (99%) rename src/{libcharon => libtnccs}/plugins/tnc_imc/tnc_imc.h (100%) rename src/{libcharon => libtnccs}/plugins/tnc_imc/tnc_imc_bind_function.c (100%) rename src/{libcharon => libtnccs}/plugins/tnc_imc/tnc_imc_manager.c (99%) rename src/{libcharon => libtnccs}/plugins/tnc_imc/tnc_imc_manager.h (100%) rename src/{libcharon => libtnccs}/plugins/tnc_imc/tnc_imc_plugin.c (100%) rename src/{libcharon => libtnccs}/plugins/tnc_imc/tnc_imc_plugin.h (100%) rename src/{libcharon => libtnccs}/plugins/tnc_tnccs/Makefile.am (100%) rename src/{libcharon => libtnccs}/plugins/tnc_tnccs/tnc_tnccs_manager.c (100%) rename src/{libcharon => libtnccs}/plugins/tnc_tnccs/tnc_tnccs_manager.h (100%) rename src/{libcharon => libtnccs}/plugins/tnc_tnccs/tnc_tnccs_plugin.c (100%) rename src/{libcharon => libtnccs}/plugins/tnc_tnccs/tnc_tnccs_plugin.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/Makefile.am (94%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/batch/tnccs_batch.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/batch/tnccs_batch.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/imc_imv_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/imc_imv_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_error_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_error_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_recommendation_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_recommendation_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/tnccs_11.c (99%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/tnccs_11.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/tnccs_11_plugin.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_11/tnccs_11_plugin.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/Makefile.am (95%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/batch/pb_tnc_batch.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/batch/pb_tnc_batch.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_access_recommendation_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_access_recommendation_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_assessment_result_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_assessment_result_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_error_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_error_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_experimental_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_experimental_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_language_preference_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_language_preference_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_pa_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_pa_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_reason_string_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_reason_string_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_tnc_msg.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/messages/pb_tnc_msg.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/tnccs_20.c (99%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/tnccs_20.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/tnccs_20_plugin.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_20/tnccs_20_plugin.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_dynamic/Makefile.am (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_dynamic/tnccs_dynamic.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_dynamic/tnccs_dynamic.h (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_dynamic/tnccs_dynamic_plugin.c (100%) rename src/{libcharon => libtnccs}/plugins/tnccs_dynamic/tnccs_dynamic_plugin.h (100%) diff --git a/configure.ac b/configure.ac index 7b23a9cb5..fb91ddd82 100644 --- a/configure.ac +++ b/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([]) diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am index ddb0ea65b..0ab66c6c8 100644 --- a/src/checksum/Makefile.am +++ b/src/checksum/Makefile.am @@ -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 diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c index 0d9e8fd85..bccd269cf 100644 --- a/src/checksum/checksum_builder.c +++ b/src/checksum/checksum_builder.c @@ -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); diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index 10d0b04cb..65e344a70 100644 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -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 diff --git a/src/libpttls/pt_tls.c b/src/libpttls/pt_tls.c index 0fee343b8..034bf6c50 100644 --- a/src/libpttls/pt_tls.c +++ b/src/libpttls/pt_tls.c @@ -17,6 +17,14 @@ #include +/** + * Described in header. + */ +void libpttls_init(void) +{ + /* empty */ +} + /* * PT-TNC Message format: * 1 2 3 diff --git a/src/libpttls/pt_tls.h b/src/libpttls/pt_tls.h index 7384cf2d5..0f1f124a8 100644 --- a/src/libpttls/pt_tls.h +++ b/src/libpttls/pt_tls.h @@ -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_ @}*/ diff --git a/src/libtnccs/Makefile.am b/src/libtnccs/Makefile.am index 720505757..8d618c3f8 100644 --- a/src/libtnccs/Makefile.am +++ b/src/libtnccs/Makefile.am @@ -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 + + diff --git a/src/libcharon/plugins/tnc_imc/Makefile.am b/src/libtnccs/plugins/tnc_imc/Makefile.am similarity index 90% rename from src/libcharon/plugins/tnc_imc/Makefile.am rename to src/libtnccs/plugins/tnc_imc/Makefile.am index 6e2b83fa0..b2c26cbff 100644 --- a/src/libcharon/plugins/tnc_imc/Makefile.am +++ b/src/libtnccs/plugins/tnc_imc/Makefile.am @@ -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 diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.c b/src/libtnccs/plugins/tnc_imc/tnc_imc.c similarity index 99% rename from src/libcharon/plugins/tnc_imc/tnc_imc.c rename to src/libtnccs/plugins/tnc_imc/tnc_imc.c index 122554abe..cbecf14c7 100644 --- a/src/libcharon/plugins/tnc_imc/tnc_imc.c +++ b/src/libtnccs/plugins/tnc_imc/tnc_imc.c @@ -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); } diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.h b/src/libtnccs/plugins/tnc_imc/tnc_imc.h similarity index 100% rename from src/libcharon/plugins/tnc_imc/tnc_imc.h rename to src/libtnccs/plugins/tnc_imc/tnc_imc.h diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c b/src/libtnccs/plugins/tnc_imc/tnc_imc_bind_function.c similarity index 100% rename from src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c rename to src/libtnccs/plugins/tnc_imc/tnc_imc_bind_function.c diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c b/src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c similarity index 99% rename from src/libcharon/plugins/tnc_imc/tnc_imc_manager.c rename to src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c index b34a6ffd8..311598fa9 100644 --- a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c +++ b/src/libtnccs/plugins/tnc_imc/tnc_imc_manager.c @@ -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, diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.h b/src/libtnccs/plugins/tnc_imc/tnc_imc_manager.h similarity index 100% rename from src/libcharon/plugins/tnc_imc/tnc_imc_manager.h rename to src/libtnccs/plugins/tnc_imc/tnc_imc_manager.h diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c b/src/libtnccs/plugins/tnc_imc/tnc_imc_plugin.c similarity index 100% rename from src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c rename to src/libtnccs/plugins/tnc_imc/tnc_imc_plugin.c diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_plugin.h b/src/libtnccs/plugins/tnc_imc/tnc_imc_plugin.h similarity index 100% rename from src/libcharon/plugins/tnc_imc/tnc_imc_plugin.h rename to src/libtnccs/plugins/tnc_imc/tnc_imc_plugin.h diff --git a/src/libcharon/plugins/tnc_tnccs/Makefile.am b/src/libtnccs/plugins/tnc_tnccs/Makefile.am similarity index 100% rename from src/libcharon/plugins/tnc_tnccs/Makefile.am rename to src/libtnccs/plugins/tnc_tnccs/Makefile.am diff --git a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c b/src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_manager.c similarity index 100% rename from src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c rename to src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_manager.c diff --git a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.h b/src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_manager.h similarity index 100% rename from src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.h rename to src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_manager.h diff --git a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.c b/src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_plugin.c similarity index 100% rename from src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.c rename to src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_plugin.c diff --git a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.h b/src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_plugin.h similarity index 100% rename from src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.h rename to src/libtnccs/plugins/tnc_tnccs/tnc_tnccs_plugin.h diff --git a/src/libcharon/plugins/tnccs_11/Makefile.am b/src/libtnccs/plugins/tnccs_11/Makefile.am similarity index 94% rename from src/libcharon/plugins/tnccs_11/Makefile.am rename to src/libtnccs/plugins/tnccs_11/Makefile.am index 4c0e0f7c8..cbe0b8e19 100644 --- a/src/libcharon/plugins/tnccs_11/Makefile.am +++ b/src/libtnccs/plugins/tnccs_11/Makefile.am @@ -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 diff --git a/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c b/src/libtnccs/plugins/tnccs_11/batch/tnccs_batch.c similarity index 100% rename from src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c rename to src/libtnccs/plugins/tnccs_11/batch/tnccs_batch.c diff --git a/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.h b/src/libtnccs/plugins/tnccs_11/batch/tnccs_batch.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/batch/tnccs_batch.h rename to src/libtnccs/plugins/tnccs_11/batch/tnccs_batch.h diff --git a/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c b/src/libtnccs/plugins/tnccs_11/messages/imc_imv_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c rename to src/libtnccs/plugins/tnccs_11/messages/imc_imv_msg.c diff --git a/src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.h b/src/libtnccs/plugins/tnccs_11/messages/imc_imv_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.h rename to src/libtnccs/plugins/tnccs_11/messages/imc_imv_msg.h diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.c b/src/libtnccs/plugins/tnccs_11/messages/tnccs_error_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.c rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_error_msg.c diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.h b/src/libtnccs/plugins/tnccs_11/messages/tnccs_error_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.h rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_error_msg.h diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c b/src/libtnccs/plugins/tnccs_11/messages/tnccs_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_msg.c diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.h b/src/libtnccs/plugins/tnccs_11/messages/tnccs_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_msg.h rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_msg.h diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c b/src/libtnccs/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h b/src/libtnccs/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_preferred_language_msg.h diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c b/src/libtnccs/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h b/src/libtnccs/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_reason_strings_msg.h diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c b/src/libtnccs/plugins/tnccs_11/messages/tnccs_recommendation_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_recommendation_msg.c diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.h b/src/libtnccs/plugins/tnccs_11/messages/tnccs_recommendation_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.h rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_recommendation_msg.h diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c b/src/libtnccs/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h b/src/libtnccs/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h rename to src/libtnccs/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.h diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11.c b/src/libtnccs/plugins/tnccs_11/tnccs_11.c similarity index 99% rename from src/libcharon/plugins/tnccs_11/tnccs_11.c rename to src/libtnccs/plugins/tnccs_11/tnccs_11.c index 53817c710..b19a048fe 100644 --- a/src/libcharon/plugins/tnccs_11/tnccs_11.c +++ b/src/libtnccs/plugins/tnccs_11/tnccs_11.c @@ -32,7 +32,6 @@ #include #include -#include #include 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; diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11.h b/src/libtnccs/plugins/tnccs_11/tnccs_11.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/tnccs_11.h rename to src/libtnccs/plugins/tnccs_11/tnccs_11.h diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11_plugin.c b/src/libtnccs/plugins/tnccs_11/tnccs_11_plugin.c similarity index 100% rename from src/libcharon/plugins/tnccs_11/tnccs_11_plugin.c rename to src/libtnccs/plugins/tnccs_11/tnccs_11_plugin.c diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11_plugin.h b/src/libtnccs/plugins/tnccs_11/tnccs_11_plugin.h similarity index 100% rename from src/libcharon/plugins/tnccs_11/tnccs_11_plugin.h rename to src/libtnccs/plugins/tnccs_11/tnccs_11_plugin.h diff --git a/src/libcharon/plugins/tnccs_20/Makefile.am b/src/libtnccs/plugins/tnccs_20/Makefile.am similarity index 95% rename from src/libcharon/plugins/tnccs_20/Makefile.am rename to src/libtnccs/plugins/tnccs_20/Makefile.am index 7a2b6c9c2..c268f5971 100644 --- a/src/libcharon/plugins/tnccs_20/Makefile.am +++ b/src/libtnccs/plugins/tnccs_20/Makefile.am @@ -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 diff --git a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c b/src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c rename to src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.c diff --git a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.h b/src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.h rename to src/libtnccs/plugins/tnccs_20/batch/pb_tnc_batch.h diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c b/src/libtnccs/plugins/tnccs_20/messages/pb_access_recommendation_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c rename to src/libtnccs/plugins/tnccs_20/messages/pb_access_recommendation_msg.c diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_access_recommendation_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.h rename to src/libtnccs/plugins/tnccs_20/messages/pb_access_recommendation_msg.h diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c b/src/libtnccs/plugins/tnccs_20/messages/pb_assessment_result_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c rename to src/libtnccs/plugins/tnccs_20/messages/pb_assessment_result_msg.c diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_assessment_result_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.h rename to src/libtnccs/plugins/tnccs_20/messages/pb_assessment_result_msg.h diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c b/src/libtnccs/plugins/tnccs_20/messages/pb_error_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c rename to src/libtnccs/plugins/tnccs_20/messages/pb_error_msg.c diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_error_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_error_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_error_msg.h rename to src/libtnccs/plugins/tnccs_20/messages/pb_error_msg.h diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.c b/src/libtnccs/plugins/tnccs_20/messages/pb_experimental_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.c rename to src/libtnccs/plugins/tnccs_20/messages/pb_experimental_msg.c diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_experimental_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_experimental_msg.h rename to src/libtnccs/plugins/tnccs_20/messages/pb_experimental_msg.h diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c b/src/libtnccs/plugins/tnccs_20/messages/pb_language_preference_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c rename to src/libtnccs/plugins/tnccs_20/messages/pb_language_preference_msg.c diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_language_preference_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.h rename to src/libtnccs/plugins/tnccs_20/messages/pb_language_preference_msg.h diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c b/src/libtnccs/plugins/tnccs_20/messages/pb_pa_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c rename to src/libtnccs/plugins/tnccs_20/messages/pb_pa_msg.c diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_pa_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.h rename to src/libtnccs/plugins/tnccs_20/messages/pb_pa_msg.h diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c b/src/libtnccs/plugins/tnccs_20/messages/pb_reason_string_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c rename to src/libtnccs/plugins/tnccs_20/messages/pb_reason_string_msg.c diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_reason_string_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.h rename to src/libtnccs/plugins/tnccs_20/messages/pb_reason_string_msg.h diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c b/src/libtnccs/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c rename to src/libtnccs/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h rename to src/libtnccs/plugins/tnccs_20/messages/pb_remediation_parameters_msg.h diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.c b/src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.c rename to src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.c diff --git a/src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.h b/src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/messages/pb_tnc_msg.h rename to src/libtnccs/plugins/tnccs_20/messages/pb_tnc_msg.h diff --git a/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c b/src/libtnccs/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c rename to src/libtnccs/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c diff --git a/src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h b/src/libtnccs/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h rename to src/libtnccs/plugins/tnccs_20/state_machine/pb_tnc_state_machine.h diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.c b/src/libtnccs/plugins/tnccs_20/tnccs_20.c similarity index 99% rename from src/libcharon/plugins/tnccs_20/tnccs_20.c rename to src/libtnccs/plugins/tnccs_20/tnccs_20.c index 55f33c143..09900ade9 100644 --- a/src/libcharon/plugins/tnccs_20/tnccs_20.c +++ b/src/libtnccs/plugins/tnccs_20/tnccs_20.c @@ -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; diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.h b/src/libtnccs/plugins/tnccs_20/tnccs_20.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/tnccs_20.h rename to src/libtnccs/plugins/tnccs_20/tnccs_20.h diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20_plugin.c b/src/libtnccs/plugins/tnccs_20/tnccs_20_plugin.c similarity index 100% rename from src/libcharon/plugins/tnccs_20/tnccs_20_plugin.c rename to src/libtnccs/plugins/tnccs_20/tnccs_20_plugin.c diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20_plugin.h b/src/libtnccs/plugins/tnccs_20/tnccs_20_plugin.h similarity index 100% rename from src/libcharon/plugins/tnccs_20/tnccs_20_plugin.h rename to src/libtnccs/plugins/tnccs_20/tnccs_20_plugin.h diff --git a/src/libcharon/plugins/tnccs_dynamic/Makefile.am b/src/libtnccs/plugins/tnccs_dynamic/Makefile.am similarity index 100% rename from src/libcharon/plugins/tnccs_dynamic/Makefile.am rename to src/libtnccs/plugins/tnccs_dynamic/Makefile.am diff --git a/src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c b/src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic.c similarity index 100% rename from src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c rename to src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic.c diff --git a/src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.h b/src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic.h similarity index 100% rename from src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.h rename to src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic.h diff --git a/src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic_plugin.c b/src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic_plugin.c similarity index 100% rename from src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic_plugin.c rename to src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic_plugin.c diff --git a/src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic_plugin.h b/src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic_plugin.h similarity index 100% rename from src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic_plugin.h rename to src/libtnccs/plugins/tnccs_dynamic/tnccs_dynamic_plugin.h