From 326a94232d1286336e63fe3b4603f1fcdd6fe0fa Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 19 Dec 2011 15:22:50 +0100 Subject: [PATCH] Moved eap/xauth classes out of protocol specific subdirectories --- src/libcharon/Makefile.am | 8 ++++---- src/libcharon/daemon.h | 4 ++-- src/libcharon/plugins/eap_aka/eap_aka_peer.h | 2 +- src/libcharon/plugins/eap_aka/eap_aka_server.h | 2 +- src/libcharon/plugins/eap_gtc/eap_gtc.h | 2 +- src/libcharon/plugins/eap_identity/eap_identity.h | 2 +- src/libcharon/plugins/eap_md5/eap_md5.h | 2 +- src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h | 2 +- src/libcharon/plugins/eap_peap/eap_peap.h | 2 +- src/libcharon/plugins/eap_peap/eap_peap_peer.h | 2 +- src/libcharon/plugins/eap_peap/eap_peap_server.h | 2 +- src/libcharon/plugins/eap_radius/eap_radius.h | 2 +- src/libcharon/plugins/eap_sim/eap_sim_peer.h | 2 +- src/libcharon/plugins/eap_sim/eap_sim_server.h | 2 +- src/libcharon/plugins/eap_tls/eap_tls.h | 2 +- src/libcharon/plugins/eap_tnc/eap_tnc.h | 2 +- src/libcharon/plugins/eap_ttls/eap_ttls.h | 2 +- src/libcharon/plugins/eap_ttls/eap_ttls_peer.c | 2 +- src/libcharon/plugins/eap_ttls/eap_ttls_server.c | 2 +- src/libcharon/plugins/xauth_generic/xauth_generic.h | 2 +- .../sa/{ikev2/authenticators => }/eap/eap_manager.c | 0 .../sa/{ikev2/authenticators => }/eap/eap_manager.h | 2 +- .../sa/{ikev2/authenticators => }/eap/eap_method.c | 0 .../sa/{ikev2/authenticators => }/eap/eap_method.h | 0 src/libcharon/sa/ikev2/authenticators/eap_authenticator.c | 2 +- .../sa/{ikev1/authenticators => }/xauth/xauth_manager.c | 0 .../sa/{ikev1/authenticators => }/xauth/xauth_manager.h | 2 +- .../sa/{ikev1/authenticators => }/xauth/xauth_method.c | 0 .../sa/{ikev1/authenticators => }/xauth/xauth_method.h | 0 29 files changed, 27 insertions(+), 27 deletions(-) rename src/libcharon/sa/{ikev2/authenticators => }/eap/eap_manager.c (100%) rename src/libcharon/sa/{ikev2/authenticators => }/eap/eap_manager.h (98%) rename src/libcharon/sa/{ikev2/authenticators => }/eap/eap_method.c (100%) rename src/libcharon/sa/{ikev2/authenticators => }/eap/eap_method.h (100%) rename src/libcharon/sa/{ikev1/authenticators => }/xauth/xauth_manager.c (100%) rename src/libcharon/sa/{ikev1/authenticators => }/xauth/xauth_manager.h (97%) rename src/libcharon/sa/{ikev1/authenticators => }/xauth/xauth_method.c (100%) rename src/libcharon/sa/{ikev1/authenticators => }/xauth/xauth_method.h (100%) diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index 474b20521..ac19bfd5c 100644 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -57,6 +57,10 @@ processing/jobs/start_action_job.c processing/jobs/start_action_job.h \ processing/jobs/roam_job.c processing/jobs/roam_job.h \ processing/jobs/update_sa_job.c processing/jobs/update_sa_job.h \ processing/jobs/inactivity_job.c processing/jobs/inactivity_job.h \ +sa/eap/eap_method.c sa/eap/eap_method.h \ +sa/eap/eap_manager.c sa/eap/eap_manager.h \ +sa/xauth/xauth_method.c sa/xauth/xauth_method.h \ +sa/xauth/xauth_manager.c sa/xauth/xauth_manager.h \ sa/authenticator.c sa/authenticator.h \ sa/child_sa.c sa/child_sa.h \ sa/ike_sa.c sa/ike_sa.h \ @@ -70,8 +74,6 @@ sa/task.c sa/task.h \ sa/ikev2/keymat_v2.c sa/ikev2/keymat_v2.h \ sa/ikev2/task_manager_v2.c sa/ikev2/task_manager_v2.h \ sa/ikev2/authenticators/eap_authenticator.c sa/ikev2/authenticators/eap_authenticator.h \ -sa/ikev2/authenticators/eap/eap_method.c sa/ikev2/authenticators/eap/eap_method.h \ -sa/ikev2/authenticators/eap/eap_manager.c sa/ikev2/authenticators/eap/eap_manager.h \ sa/ikev2/authenticators/psk_authenticator.c sa/ikev2/authenticators/psk_authenticator.h \ sa/ikev2/authenticators/pubkey_authenticator.c sa/ikev2/authenticators/pubkey_authenticator.h \ sa/ikev2/tasks/child_create.c sa/ikev2/tasks/child_create.h \ @@ -95,8 +97,6 @@ sa/ikev1/task_manager_v1.c sa/ikev1/task_manager_v1.h \ sa/ikev1/authenticators/psk_v1_authenticator.c sa/ikev1/authenticators/psk_v1_authenticator.h \ sa/ikev1/authenticators/pubkey_v1_authenticator.c sa/ikev1/authenticators/pubkey_v1_authenticator.h \ sa/ikev1/authenticators/hybrid_authenticator.c sa/ikev1/authenticators/hybrid_authenticator.h \ -sa/ikev1/authenticators/xauth/xauth_method.c sa/ikev1/authenticators/xauth/xauth_method.h \ -sa/ikev1/authenticators/xauth/xauth_manager.c sa/ikev1/authenticators/xauth/xauth_manager.h \ sa/ikev1/tasks/main_mode.c sa/ikev1/tasks/main_mode.h \ sa/ikev1/tasks/informational.c sa/ikev1/tasks/informational.h \ sa/ikev1/tasks/isakmp_cert_pre.c sa/ikev1/tasks/isakmp_cert_pre.h \ diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h index 785ad23bf..bfbf774ff 100644 --- a/src/libcharon/daemon.h +++ b/src/libcharon/daemon.h @@ -148,8 +148,8 @@ typedef struct daemon_t daemon_t; #include #include #include -#include -#include +#include +#include #ifdef ME #include diff --git a/src/libcharon/plugins/eap_aka/eap_aka_peer.h b/src/libcharon/plugins/eap_aka/eap_aka_peer.h index 4fc1821c4..b6ab5cdc5 100644 --- a/src/libcharon/plugins/eap_aka/eap_aka_peer.h +++ b/src/libcharon/plugins/eap_aka/eap_aka_peer.h @@ -23,7 +23,7 @@ typedef struct eap_aka_peer_t eap_aka_peer_t; -#include +#include /** * EAP-AKA peer implementation. diff --git a/src/libcharon/plugins/eap_aka/eap_aka_server.h b/src/libcharon/plugins/eap_aka/eap_aka_server.h index 4819021d2..5c95180ac 100644 --- a/src/libcharon/plugins/eap_aka/eap_aka_server.h +++ b/src/libcharon/plugins/eap_aka/eap_aka_server.h @@ -23,7 +23,7 @@ typedef struct eap_aka_server_t eap_aka_server_t; -#include +#include /** * EAP-AKA server implementation. diff --git a/src/libcharon/plugins/eap_gtc/eap_gtc.h b/src/libcharon/plugins/eap_gtc/eap_gtc.h index 0ce46b303..4dac53cfb 100644 --- a/src/libcharon/plugins/eap_gtc/eap_gtc.h +++ b/src/libcharon/plugins/eap_gtc/eap_gtc.h @@ -23,7 +23,7 @@ typedef struct eap_gtc_t eap_gtc_t; -#include +#include /** * Implementation of the eap_method_t interface using EAP-GTC. diff --git a/src/libcharon/plugins/eap_identity/eap_identity.h b/src/libcharon/plugins/eap_identity/eap_identity.h index 811b19b5b..4e7f6fd9d 100644 --- a/src/libcharon/plugins/eap_identity/eap_identity.h +++ b/src/libcharon/plugins/eap_identity/eap_identity.h @@ -23,7 +23,7 @@ typedef struct eap_identity_t eap_identity_t; -#include +#include /** * Implementation of the eap_method_t interface using EAP Identity. diff --git a/src/libcharon/plugins/eap_md5/eap_md5.h b/src/libcharon/plugins/eap_md5/eap_md5.h index 302abc4e6..5396535e1 100644 --- a/src/libcharon/plugins/eap_md5/eap_md5.h +++ b/src/libcharon/plugins/eap_md5/eap_md5.h @@ -23,7 +23,7 @@ typedef struct eap_md5_t eap_md5_t; -#include +#include /** * Implementation of the eap_method_t interface using EAP-MD5 (CHAP). diff --git a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h index 44050d0da..0e7abc397 100644 --- a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h +++ b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.h @@ -23,7 +23,7 @@ typedef struct eap_mschapv2_t eap_mschapv2_t; -#include +#include /** * Implementation of the eap_method_t interface using EAP-MS-CHAPv2. diff --git a/src/libcharon/plugins/eap_peap/eap_peap.h b/src/libcharon/plugins/eap_peap/eap_peap.h index 7bf7b1d70..2756ad3e6 100644 --- a/src/libcharon/plugins/eap_peap/eap_peap.h +++ b/src/libcharon/plugins/eap_peap/eap_peap.h @@ -23,7 +23,7 @@ typedef struct eap_peap_t eap_peap_t; -#include +#include /** * Implementation of eap_method_t using EAP-PEAP. diff --git a/src/libcharon/plugins/eap_peap/eap_peap_peer.h b/src/libcharon/plugins/eap_peap/eap_peap_peer.h index 61586b16c..196d4e2c4 100644 --- a/src/libcharon/plugins/eap_peap/eap_peap_peer.h +++ b/src/libcharon/plugins/eap_peap/eap_peap_peer.h @@ -26,7 +26,7 @@ typedef struct eap_peap_peer_t eap_peap_peer_t; #include "tls_application.h" #include -#include +#include /** * TLS application data handler as peer. diff --git a/src/libcharon/plugins/eap_peap/eap_peap_server.h b/src/libcharon/plugins/eap_peap/eap_peap_server.h index cc03d4ba9..4585a622a 100644 --- a/src/libcharon/plugins/eap_peap/eap_peap_server.h +++ b/src/libcharon/plugins/eap_peap/eap_peap_server.h @@ -26,7 +26,7 @@ typedef struct eap_peap_server_t eap_peap_server_t; #include "tls_application.h" #include -#include +#include /** * TLS application data handler as server. diff --git a/src/libcharon/plugins/eap_radius/eap_radius.h b/src/libcharon/plugins/eap_radius/eap_radius.h index 9cfdbb95d..875543554 100644 --- a/src/libcharon/plugins/eap_radius/eap_radius.h +++ b/src/libcharon/plugins/eap_radius/eap_radius.h @@ -23,7 +23,7 @@ typedef struct eap_radius_t eap_radius_t; -#include +#include /** * Implementation of the eap_method_t interface using a RADIUS server. diff --git a/src/libcharon/plugins/eap_sim/eap_sim_peer.h b/src/libcharon/plugins/eap_sim/eap_sim_peer.h index c32cb3120..38315b75a 100644 --- a/src/libcharon/plugins/eap_sim/eap_sim_peer.h +++ b/src/libcharon/plugins/eap_sim/eap_sim_peer.h @@ -21,7 +21,7 @@ #ifndef EAP_SIM_PEER_H_ #define EAP_SIM_PEER_H_ -#include +#include typedef struct eap_sim_peer_t eap_sim_peer_t; diff --git a/src/libcharon/plugins/eap_sim/eap_sim_server.h b/src/libcharon/plugins/eap_sim/eap_sim_server.h index a4a0eea63..84408c43c 100644 --- a/src/libcharon/plugins/eap_sim/eap_sim_server.h +++ b/src/libcharon/plugins/eap_sim/eap_sim_server.h @@ -21,7 +21,7 @@ #ifndef EAP_SIM_SERVER_H_ #define EAP_SIM_SERVER_H_ -#include +#include typedef struct eap_sim_server_t eap_sim_server_t; diff --git a/src/libcharon/plugins/eap_tls/eap_tls.h b/src/libcharon/plugins/eap_tls/eap_tls.h index 4227c9db3..6779c3994 100644 --- a/src/libcharon/plugins/eap_tls/eap_tls.h +++ b/src/libcharon/plugins/eap_tls/eap_tls.h @@ -23,7 +23,7 @@ typedef struct eap_tls_t eap_tls_t; -#include +#include /** * Implementation of eap_method_t using EAP-TLS. diff --git a/src/libcharon/plugins/eap_tnc/eap_tnc.h b/src/libcharon/plugins/eap_tnc/eap_tnc.h index 1c7e1b6fa..7709551a5 100644 --- a/src/libcharon/plugins/eap_tnc/eap_tnc.h +++ b/src/libcharon/plugins/eap_tnc/eap_tnc.h @@ -23,7 +23,7 @@ typedef struct eap_tnc_t eap_tnc_t; -#include +#include /** * Implementation of the eap_method_t interface using EAP-TNC. diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls.h b/src/libcharon/plugins/eap_ttls/eap_ttls.h index ca2b82477..84b1a2d19 100644 --- a/src/libcharon/plugins/eap_ttls/eap_ttls.h +++ b/src/libcharon/plugins/eap_ttls/eap_ttls.h @@ -23,7 +23,7 @@ typedef struct eap_ttls_t eap_ttls_t; -#include +#include /** * Implementation of eap_method_t using EAP-TTLS. diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c b/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c index aa10c7d3d..e75bd2976 100644 --- a/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c +++ b/src/libcharon/plugins/eap_ttls/eap_ttls_peer.c @@ -19,7 +19,7 @@ #include #include -#include +#include typedef struct private_eap_ttls_peer_t private_eap_ttls_peer_t; diff --git a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c index 2a2aee12f..d2417659c 100644 --- a/src/libcharon/plugins/eap_ttls/eap_ttls_server.c +++ b/src/libcharon/plugins/eap_ttls/eap_ttls_server.c @@ -19,7 +19,7 @@ #include #include -#include +#include typedef struct private_eap_ttls_server_t private_eap_ttls_server_t; diff --git a/src/libcharon/plugins/xauth_generic/xauth_generic.h b/src/libcharon/plugins/xauth_generic/xauth_generic.h index 04e3d47bb..5773589cb 100644 --- a/src/libcharon/plugins/xauth_generic/xauth_generic.h +++ b/src/libcharon/plugins/xauth_generic/xauth_generic.h @@ -23,7 +23,7 @@ typedef struct xauth_generic_t xauth_generic_t; -#include +#include /** * Implementation of the xauth_method_t interface using cleartext secrets diff --git a/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.c b/src/libcharon/sa/eap/eap_manager.c similarity index 100% rename from src/libcharon/sa/ikev2/authenticators/eap/eap_manager.c rename to src/libcharon/sa/eap/eap_manager.c diff --git a/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.h b/src/libcharon/sa/eap/eap_manager.h similarity index 98% rename from src/libcharon/sa/ikev2/authenticators/eap/eap_manager.h rename to src/libcharon/sa/eap/eap_manager.h index 6b8754634..868eaef06 100644 --- a/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.h +++ b/src/libcharon/sa/eap/eap_manager.h @@ -21,7 +21,7 @@ #ifndef EAP_MANAGER_H_ #define EAP_MANAGER_H_ -#include +#include typedef struct eap_manager_t eap_manager_t; diff --git a/src/libcharon/sa/ikev2/authenticators/eap/eap_method.c b/src/libcharon/sa/eap/eap_method.c similarity index 100% rename from src/libcharon/sa/ikev2/authenticators/eap/eap_method.c rename to src/libcharon/sa/eap/eap_method.c diff --git a/src/libcharon/sa/ikev2/authenticators/eap/eap_method.h b/src/libcharon/sa/eap/eap_method.h similarity index 100% rename from src/libcharon/sa/ikev2/authenticators/eap/eap_method.h rename to src/libcharon/sa/eap/eap_method.h diff --git a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c index 462436d80..b81c5c853 100644 --- a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c +++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.c b/src/libcharon/sa/xauth/xauth_manager.c similarity index 100% rename from src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.c rename to src/libcharon/sa/xauth/xauth_manager.c diff --git a/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.h b/src/libcharon/sa/xauth/xauth_manager.h similarity index 97% rename from src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.h rename to src/libcharon/sa/xauth/xauth_manager.h index e7e84d06b..929d5de8f 100644 --- a/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.h +++ b/src/libcharon/sa/xauth/xauth_manager.h @@ -21,7 +21,7 @@ #ifndef XAUTH_MANAGER_H_ #define XAUTH_MANAGER_H_ -#include +#include typedef struct xauth_manager_t xauth_manager_t; diff --git a/src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.c b/src/libcharon/sa/xauth/xauth_method.c similarity index 100% rename from src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.c rename to src/libcharon/sa/xauth/xauth_method.c diff --git a/src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.h b/src/libcharon/sa/xauth/xauth_method.h similarity index 100% rename from src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.h rename to src/libcharon/sa/xauth/xauth_method.h