Moved eap/xauth classes out of protocol specific subdirectories

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 474b20521263e64e12276518b537b1f4c39d828a..ac19bfd5caa3d2850b21cb1d48baad52337531cc 100644 (file)
--- 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 785ad23bf8acba81e4e8632e5b3d6c248aa03832..bfbf774ffe518e7f4988f092dc3aed2db2480660 100644 (file)
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -148,8 +148,8 @@ typedef struct daemon_t daemon_t;
 #include <sa/trap_manager.h>
 #include <sa/shunt_manager.h>
 #include <config/backend_manager.h>
-#include <sa/ikev2/authenticators/eap/eap_manager.h>
-#include <sa/ikev1/authenticators/xauth/xauth_manager.h>
+#include <sa/eap/eap_manager.h>
+#include <sa/xauth/xauth_manager.h>
 
 #ifdef ME
 #include <sa/ikev2/connect_manager.h>

diff --git a/src/libcharon/plugins/eap_aka/eap_aka_peer.h b/src/libcharon/plugins/eap_aka/eap_aka_peer.h
index 4fc1821c4485a3dceef6306a1dff4f553d742bc5..b6ab5cdc52fc6d05d3908b20b7a03212274be1b6 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 4819021d2e4c879fd979289f3ce446a74d29e07f..5c95180ac5bca7386cc85590aa443ce84fcb9de8 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 0ce46b30312f3846c346b4cbdc5da71c9c915000..4dac53cfbe77129ac40ce55c657efce3d4d5114b 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 811b19b5b274b0ee575e254c5e607e01c55a4d01..4e7f6fd9dce0938d878aadc76eb1147ea6081166 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 302abc4e686f0139cd0fb1b48067227fa6fb8e50..5396535e10bc0867b19d7ec7bf7117f7449bd16f 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 44050d0da243f593d89ad7c8779910806a20c60f..0e7abc3975be69b7043ccc9e7c00d99f265979d7 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 7bf7b1d70f8b4073361ddbd3e0f89eebba809eae..2756ad3e6659167bc77ab4b4f3decb9aaeb3f981 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 61586b16caa28e4088df9c6c58e97596f8bf04a1..196d4e2c4b9e9759406f1327ff6700fb0e3b3c26 100644 (file)
--- 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 <library.h>
-#include <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 cc03d4ba9e7f411d76153f8bc8a6b718db9b0043..4585a622ac33fe91ed70dd70ad3c4a10796e4844 100644 (file)
--- 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 <library.h>
-#include <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 9cfdbb95dc0eab7275c997fd4237c8b8266b5345..8755435546e9796b872745ef33915b1f4b80ebaa 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 c32cb3120a80a1792045e8a580eb4fd583be0c71..38315b75ac8585af94445749b7d2b3eab6f9f686 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 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 a4a0eea63427577a31f36e684763d7dc6ea36379..84408c43c612cb882d8e750b350acf4b1bd5a91c 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 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 4227c9db3eba6fa23e5be63b7c52abe52328e4ef..6779c39947ce44ccd24224cf8d45a7693acebd89 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 1c7e1b6fad0487e13647a99dabd06b8898df0138..7709551a5950af9bd4d9fc97e0ab3531eb146dc5 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 ca2b82477328767340b512c60e61f24591bf4513..84b1a2d199d8c9a659d2dd3793236f2d0aa22bbf 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 /**
  * 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 aa10c7d3d536258b51685db90fb39490f4ae3809..e75bd29767c8a376051faee2a4e65dbfc09534a9 100644 (file)
--- 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 <debug.h>
 #include <daemon.h>
 
-#include <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 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 2a2aee12f79c9af2324bd9f2b827414e887cc961..d2417659c21b5f6381eaec346bede585cb3d83da 100644 (file)
--- 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 <debug.h>
 #include <daemon.h>
 
-#include <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 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 04e3d47bb620733d3f0ad98c2215ae5cc7b18d97..5773589cb15f7d612410dc02602cd2534caf7117 100644 (file)
--- 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 <sa/ikev1/authenticators/xauth/xauth_method.h>
+#include <sa/xauth/xauth_method.h>
 
 /**
  * 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 6b875463430fbc1d351f98161843282c923e6831..868eaef06cbabe711b91cee61f3336aa34302274 100644 (file)
--- 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 <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 
 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 462436d805fea9143b2dc86341c73db7b8e7f812..b81c5c853fd067bd399e9b3760eeedec1d93d17a 100644 (file)
--- a/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
@@ -17,7 +17,7 @@
 
 #include <daemon.h>
 #include <sa/ikev2/keymat_v2.h>
-#include <sa/ikev2/authenticators/eap/eap_method.h>
+#include <sa/eap/eap_method.h>
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/eap_payload.h>
 

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 e7e84d06bd8922c7e78f65a9eb98db2daa6b5423..929d5de8f7c64f0114fac91eaceff6c1c738b2cb 100644 (file)
--- 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 <sa/ikev1/authenticators/xauth/xauth_method.h>
+#include <sa/xauth/xauth_method.h>
 
 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