Separated libcharon/sa directory with ikev1 and ikev2 subfolders

diff --git a/src/conftest/hooks/pretend_auth.c b/src/conftest/hooks/pretend_auth.c
index 10b13c6ac479abfe8bb2b0d86700b39e427e8722..3a7bb4f6b9c0fca6ea231d67b2b6ffc0b3565aa3 100644 (file)
--- a/src/conftest/hooks/pretend_auth.c
+++ b/src/conftest/hooks/pretend_auth.c
@@ -15,7 +15,7 @@
 
 #include "hook.h"
 
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/cert_payload.h>
 #include <encoding/payloads/auth_payload.h>

diff --git a/src/conftest/hooks/rebuild_auth.c b/src/conftest/hooks/rebuild_auth.c
index cf9b113cc85b83485f6c95a9f65f4b235d64e4f8..1197eb2dc16134ff9bb3d58a9fc2fca3955ca8cd 100644 (file)
--- a/src/conftest/hooks/rebuild_auth.c
+++ b/src/conftest/hooks/rebuild_auth.c
@@ -15,7 +15,7 @@
 
 #include "hook.h"
 
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 #include <encoding/generator.h>
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/auth_payload.h>

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 95bec0966df410436bd7007f2046748c58a8ccc6..474b20521263e64e12276518b537b1f4c39d828a 100644 (file)
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -57,55 +57,57 @@ 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/authenticators/authenticator.c sa/authenticators/authenticator.h \
-sa/authenticators/eap_authenticator.c sa/authenticators/eap_authenticator.h \
-sa/authenticators/eap/eap_method.c sa/authenticators/eap/eap_method.h \
-sa/authenticators/eap/eap_manager.c sa/authenticators/eap/eap_manager.h \
-sa/authenticators/psk_authenticator.c sa/authenticators/psk_authenticator.h \
-sa/authenticators/pubkey_authenticator.c sa/authenticators/pubkey_authenticator.h \
-sa/authenticators/psk_v1_authenticator.c sa/authenticators/psk_v1_authenticator.h \
-sa/authenticators/pubkey_v1_authenticator.c sa/authenticators/pubkey_v1_authenticator.h \
-sa/authenticators/hybrid_authenticator.c sa/authenticators/hybrid_authenticator.h \
-sa/authenticators/xauth/xauth_method.c sa/authenticators/xauth/xauth_method.h \
-sa/authenticators/xauth/xauth_manager.c sa/authenticators/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 \
 sa/ike_sa_id.c sa/ike_sa_id.h \
+sa/keymat.h sa/keymat.c \
 sa/ike_sa_manager.c sa/ike_sa_manager.h \
-sa/task_manager.h sa/task_manager.c sa/task_manager_v2.c sa/task_manager_v2.h \
-sa/task_manager_v1.c sa/task_manager_v1.h \
-sa/keymat.h sa/keymat.c sa/keymat_v2.c sa/keymat_v2.h \
-sa/keymat_v1.c sa/keymat_v1.h \
+sa/task_manager.h sa/task_manager.c \
 sa/shunt_manager.c sa/shunt_manager.h \
 sa/trap_manager.c sa/trap_manager.h \
-sa/tasks/child_create.c sa/tasks/child_create.h \
-sa/tasks/child_delete.c sa/tasks/child_delete.h \
-sa/tasks/child_rekey.c sa/tasks/child_rekey.h \
-sa/tasks/ike_auth.c sa/tasks/ike_auth.h \
-sa/tasks/ike_cert_pre.c sa/tasks/ike_cert_pre.h \
-sa/tasks/ike_cert_post.c sa/tasks/ike_cert_post.h \
-sa/tasks/ike_config.c sa/tasks/ike_config.h \
-sa/tasks/ike_delete.c sa/tasks/ike_delete.h \
-sa/tasks/ike_dpd.c sa/tasks/ike_dpd.h \
-sa/tasks/ike_init.c sa/tasks/ike_init.h \
-sa/tasks/ike_natd.c sa/tasks/ike_natd.h \
-sa/tasks/ike_mobike.c sa/tasks/ike_mobike.h \
-sa/tasks/ike_rekey.c sa/tasks/ike_rekey.h \
-sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
-sa/tasks/ike_auth_lifetime.c sa/tasks/ike_auth_lifetime.h \
-sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
-sa/tasks/main_mode.c sa/tasks/main_mode.h \
-sa/tasks/informational.c sa/tasks/informational.h \
-sa/tasks/isakmp_cert_pre.c sa/tasks/isakmp_cert_pre.h \
-sa/tasks/isakmp_cert_post.c sa/tasks/isakmp_cert_post.h \
-sa/tasks/isakmp_natd.c sa/tasks/isakmp_natd.h \
-sa/tasks/isakmp_vendor.c sa/tasks/isakmp_vendor.h \
-sa/tasks/isakmp_delete.c sa/tasks/isakmp_delete.h \
-sa/tasks/xauth.c sa/tasks/xauth.h \
-sa/tasks/quick_mode.c sa/tasks/quick_mode.h \
-sa/tasks/quick_delete.c sa/tasks/quick_delete.h \
-sa/tasks/mode_config.c sa/tasks/mode_config.h \
-sa/tasks/task.c sa/tasks/task.h
+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 \
+sa/ikev2/tasks/child_delete.c sa/ikev2/tasks/child_delete.h \
+sa/ikev2/tasks/child_rekey.c sa/ikev2/tasks/child_rekey.h \
+sa/ikev2/tasks/ike_auth.c sa/ikev2/tasks/ike_auth.h \
+sa/ikev2/tasks/ike_cert_pre.c sa/ikev2/tasks/ike_cert_pre.h \
+sa/ikev2/tasks/ike_cert_post.c sa/ikev2/tasks/ike_cert_post.h \
+sa/ikev2/tasks/ike_config.c sa/ikev2/tasks/ike_config.h \
+sa/ikev2/tasks/ike_delete.c sa/ikev2/tasks/ike_delete.h \
+sa/ikev2/tasks/ike_dpd.c sa/ikev2/tasks/ike_dpd.h \
+sa/ikev2/tasks/ike_init.c sa/ikev2/tasks/ike_init.h \
+sa/ikev2/tasks/ike_natd.c sa/ikev2/tasks/ike_natd.h \
+sa/ikev2/tasks/ike_mobike.c sa/ikev2/tasks/ike_mobike.h \
+sa/ikev2/tasks/ike_rekey.c sa/ikev2/tasks/ike_rekey.h \
+sa/ikev2/tasks/ike_reauth.c sa/ikev2/tasks/ike_reauth.h \
+sa/ikev2/tasks/ike_auth_lifetime.c sa/ikev2/tasks/ike_auth_lifetime.h \
+sa/ikev2/tasks/ike_vendor.c sa/ikev2/tasks/ike_vendor.h \
+sa/ikev1/keymat_v1.c sa/ikev1/keymat_v1.h \
+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 \
+sa/ikev1/tasks/isakmp_cert_post.c sa/ikev1/tasks/isakmp_cert_post.h \
+sa/ikev1/tasks/isakmp_natd.c sa/ikev1/tasks/isakmp_natd.h \
+sa/ikev1/tasks/isakmp_vendor.c sa/ikev1/tasks/isakmp_vendor.h \
+sa/ikev1/tasks/isakmp_delete.c sa/ikev1/tasks/isakmp_delete.h \
+sa/ikev1/tasks/xauth.c sa/ikev1/tasks/xauth.h \
+sa/ikev1/tasks/quick_mode.c sa/ikev1/tasks/quick_mode.h \
+sa/ikev1/tasks/quick_delete.c sa/ikev1/tasks/quick_delete.h \
+sa/ikev1/tasks/mode_config.c sa/ikev1/tasks/mode_config.h
 
 
 daemon.lo :            $(top_builddir)/config.status
@@ -132,9 +134,9 @@ if USE_ME
   libcharon_la_SOURCES += encoding/payloads/endpoint_notify.c encoding/payloads/endpoint_notify.h \
     processing/jobs/initiate_mediation_job.c processing/jobs/initiate_mediation_job.h \
     processing/jobs/mediation_job.c processing/jobs/mediation_job.h \
-    sa/connect_manager.c sa/connect_manager.h \
-    sa/mediation_manager.c sa/mediation_manager.h \
-    sa/tasks/ike_me.c sa/tasks/ike_me.h
+    sa/ikev2/connect_manager.c sa/ikev2/connect_manager.h \
+    sa/ikev2/mediation_manager.c sa/ikev2/mediation_manager.h \
+    sa/ikev2/tasks/ike_me.c sa/ikev2/tasks/ike_me.h
 endif
 
 if USE_LIBCAP

diff --git a/src/libcharon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h
index f1915614a2141cf78c1cbf63eb2ae6f41b54a694..dcbe6aa9e169bf69952e0283d41a0f974b71604d 100644 (file)
--- a/src/libcharon/config/peer_cfg.h
+++ b/src/libcharon/config/peer_cfg.h
@@ -35,8 +35,6 @@ typedef struct peer_cfg_t peer_cfg_t;
 #include <config/proposal.h>
 #include <config/ike_cfg.h>
 #include <config/child_cfg.h>
-#include <sa/authenticators/authenticator.h>
-#include <sa/authenticators/eap/eap_method.h>
 #include <credentials/auth_cfg.h>
 
 /**

diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index a887eab79fdfba813874dd5a03b25004d28c7343..785ad23bf8acba81e4e8632e5b3d6c248aa03832 100644 (file)
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -148,12 +148,12 @@ typedef struct daemon_t daemon_t;
 #include <sa/trap_manager.h>
 #include <sa/shunt_manager.h>
 #include <config/backend_manager.h>
-#include <sa/authenticators/eap/eap_manager.h>
-#include <sa/authenticators/xauth/xauth_manager.h>
+#include <sa/ikev2/authenticators/eap/eap_manager.h>
+#include <sa/ikev1/authenticators/xauth/xauth_manager.h>
 
 #ifdef ME
-#include <sa/connect_manager.h>
-#include <sa/mediation_manager.h>
+#include <sa/ikev2/connect_manager.h>
+#include <sa/ikev2/mediation_manager.h>
 #endif /* ME */
 
 /**

diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c
index 708e3fb973e415230156bdd2590c065c731f9c11..cf2a66efa1d3cdacbc48035a43dc28192fe3005c 100644 (file)
--- a/src/libcharon/encoding/message.c
+++ b/src/libcharon/encoding/message.c
@@ -24,7 +24,7 @@
 
 #include <library.h>
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <encoding/generator.h>
 #include <encoding/parser.h>
 #include <encoding/payloads/encodings.h>

diff --git a/src/libcharon/encoding/payloads/auth_payload.h b/src/libcharon/encoding/payloads/auth_payload.h
index 521fe1d1962f7e19fec09df8d2bd5ed62023c5af..b922d12c85d433a337c584398f3bfbfc498808b2 100644 (file)
--- a/src/libcharon/encoding/payloads/auth_payload.h
+++ b/src/libcharon/encoding/payloads/auth_payload.h
@@ -26,7 +26,7 @@ typedef struct auth_payload_t auth_payload_t;
 
 #include <library.h>
 #include <encoding/payloads/payload.h>
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Class representing an IKEv2 AUTH payload.

diff --git a/src/libcharon/encoding/payloads/eap_payload.c b/src/libcharon/encoding/payloads/eap_payload.c
index 9982f05a160442cb99478e7f593191a0ba05f672..1b9a5c8028c00083192cf37e34d12ff847452987 100644 (file)
--- a/src/libcharon/encoding/payloads/eap_payload.c
+++ b/src/libcharon/encoding/payloads/eap_payload.c
@@ -19,6 +19,7 @@
 #include "eap_payload.h"
 
 #include <daemon.h>
+#include <eap/eap.h>
 
 typedef struct private_eap_payload_t private_eap_payload_t;
 

diff --git a/src/libcharon/encoding/payloads/eap_payload.h b/src/libcharon/encoding/payloads/eap_payload.h
index e63db7d880e234c07d8b2f5bf05ae4f7fee7599e..52bc7ac5eabcebcb80ec10b42b92aaa6f9dbd2ce 100644 (file)
--- a/src/libcharon/encoding/payloads/eap_payload.h
+++ b/src/libcharon/encoding/payloads/eap_payload.h
@@ -25,8 +25,8 @@
 typedef struct eap_payload_t eap_payload_t;
 
 #include <library.h>
+#include <eap/eap.h>
 #include <encoding/payloads/payload.h>
-#include <sa/authenticators/eap/eap_method.h>
 
 /**
  * Class representing an IKEv2 EAP payload.

diff --git a/src/libcharon/encoding/payloads/proposal_substructure.h b/src/libcharon/encoding/payloads/proposal_substructure.h
index 03b26e12756c8c5e0704d11b523255283fe56d9c..aefdf2f277f693ae8e66428f8b065f7bc547366c 100644 (file)
--- a/src/libcharon/encoding/payloads/proposal_substructure.h
+++ b/src/libcharon/encoding/payloads/proposal_substructure.h
@@ -30,7 +30,7 @@ typedef struct proposal_substructure_t proposal_substructure_t;
 #include <config/proposal.h>
 #include <utils/linked_list.h>
 #include <kernel/kernel_ipsec.h>
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Class representing an IKEv1/IKEv2 proposal substructure.

diff --git a/src/libcharon/encoding/payloads/sa_payload.h b/src/libcharon/encoding/payloads/sa_payload.h
index dfba477498ee3946585092b0cb5f8dee4654b6e5..6dfbd5180580faa2f076e9eab4fcaaed6d2ac487 100644 (file)
--- a/src/libcharon/encoding/payloads/sa_payload.h
+++ b/src/libcharon/encoding/payloads/sa_payload.h
@@ -29,7 +29,7 @@ typedef struct sa_payload_t sa_payload_t;
 #include <encoding/payloads/proposal_substructure.h>
 #include <utils/linked_list.h>
 #include <kernel/kernel_ipsec.h>
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Class representing an IKEv1 or IKEv2 SA Payload.

diff --git a/src/libcharon/plugins/eap_aka/eap_aka_peer.h b/src/libcharon/plugins/eap_aka/eap_aka_peer.h
index 974ba27210efefc8c9337a71ed125b6cac1f4712..4fc1821c4485a3dceef6306a1dff4f553d742bc5 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 5ab1c4dfd923290273768484b857b7f9666a5bcc..4819021d2e4c879fd979289f3ce446a74d29e07f 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 2eb8482f8697beceff57a3fc7b04d9c22a884337..0ce46b30312f3846c346b4cbdc5da71c9c915000 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 9a7f2857490388ad96c8bdca26ee292b57cf8997..811b19b5b274b0ee575e254c5e607e01c55a4d01 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 c6687149a919373dde247b1a1b563c686a423dda..302abc4e686f0139cd0fb1b48067227fa6fb8e50 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 34cc1141ed64260d7cdd5c0fc6e4ddd170894537..44050d0da243f593d89ad7c8779910806a20c60f 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 f47bad561c617805cb27896e5668f9362044a34b..7bf7b1d70f8b4073361ddbd3e0f89eebba809eae 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 a875442093f96c9fef9765ccd23fc3a966c42ccd..61586b16caa28e4088df9c6c58e97596f8bf04a1 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 93141d62b0146ec22f762eabf84adf3a9ce94f9c..cc03d4ba9e7f411d76153f8bc8a6b718db9b0043 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 e98cb06e30ea22e3fa8c93d9d709ae25125ce4da..9cfdbb95dc0eab7275c997fd4237c8b8266b5345 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 ba72ce4841279313cb45f6333b65b5ee17c94680..c32cb3120a80a1792045e8a580eb4fd583be0c71 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 c0ed64ff21b576c0597fe41f1207010f267ec06d..a4a0eea63427577a31f36e684763d7dc6ea36379 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 7e080230a1afa308ad66e8991f085873b098998f..4227c9db3eba6fa23e5be63b7c52abe52328e4ef 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 7e166fb605337045298e437d193baffdaf94660d..1c7e1b6fad0487e13647a99dabd06b8898df0138 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 6e3bf2cebee51291b76152ff27b71b3c69e79562..ca2b82477328767340b512c60e61f24591bf4513 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 d2feb7774aaf2bef2509b325821d3d63d1512ac6..aa10c7d3d536258b51685db90fb39490f4ae3809 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 3c46993b73aed0032f54d1f773103fa217f02f20..2a2aee12f79c9af2324bd9f2b827414e887cc961 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/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/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 dfb759b82de834352a88a8236d219de650354e37..04e3d47bb620733d3f0ad98c2215ae5cc7b18d97 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/authenticators/xauth/xauth_method.h>
+#include <sa/ikev1/authenticators/xauth/xauth_method.h>
 
 /**
  * Implementation of the xauth_method_t interface using cleartext secrets

diff --git a/src/libcharon/sa/authenticators/authenticator.c b/src/libcharon/sa/authenticator.c
similarity index 92%
rename from src/libcharon/sa/authenticators/authenticator.c
rename to src/libcharon/sa/authenticator.c
index 73029b9e148e20c3cfe43ef48fdfdd66036d1b32..d7a4b3eef1fa8a2cfc891b8a5ba1b969ab077d0f 100644 (file)
--- a/src/libcharon/sa/authenticators/authenticator.c
+++ b/src/libcharon/sa/authenticator.c
@@ -18,12 +18,12 @@
 
 #include "authenticator.h"
 
-#include <sa/authenticators/pubkey_authenticator.h>
-#include <sa/authenticators/psk_authenticator.h>
-#include <sa/authenticators/eap_authenticator.h>
-#include <sa/authenticators/psk_v1_authenticator.h>
-#include <sa/authenticators/pubkey_v1_authenticator.h>
-#include <sa/authenticators/hybrid_authenticator.h>
+#include <sa/ikev2/authenticators/pubkey_authenticator.h>
+#include <sa/ikev2/authenticators/psk_authenticator.h>
+#include <sa/ikev2/authenticators/eap_authenticator.h>
+#include <sa/ikev1/authenticators/psk_v1_authenticator.h>
+#include <sa/ikev1/authenticators/pubkey_v1_authenticator.h>
+#include <sa/ikev1/authenticators/hybrid_authenticator.h>
 #include <encoding/payloads/auth_payload.h>
 
 

diff --git a/src/libcharon/sa/authenticators/authenticator.h b/src/libcharon/sa/authenticator.h
similarity index 100%
rename from src/libcharon/sa/authenticators/authenticator.h
rename to src/libcharon/sa/authenticator.h

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 331b001bf6348a3dc6a68cd27e4abe943cef13c9..0ee4324bf71c2f0778e40b35af79f6ff63b25e5d 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -28,30 +28,30 @@
 #include <daemon.h>
 #include <utils/linked_list.h>
 #include <utils/lexparser.h>
-#include <sa/tasks/ike_init.h>
-#include <sa/tasks/ike_natd.h>
-#include <sa/tasks/ike_mobike.h>
-#include <sa/tasks/ike_auth.h>
-#include <sa/tasks/ike_auth_lifetime.h>
-#include <sa/tasks/ike_config.h>
-#include <sa/tasks/ike_cert_pre.h>
-#include <sa/tasks/ike_cert_post.h>
-#include <sa/tasks/ike_rekey.h>
-#include <sa/tasks/ike_reauth.h>
-#include <sa/tasks/ike_delete.h>
-#include <sa/tasks/ike_dpd.h>
-#include <sa/tasks/ike_vendor.h>
-#include <sa/tasks/child_create.h>
-#include <sa/tasks/child_delete.h>
-#include <sa/tasks/child_rekey.h>
-#include <sa/tasks/main_mode.h>
-#include <sa/tasks/isakmp_cert_pre.h>
-#include <sa/tasks/isakmp_cert_post.h>
-#include <sa/tasks/isakmp_natd.h>
-#include <sa/tasks/quick_mode.h>
-#include <sa/tasks/quick_delete.h>
-#include <sa/tasks/isakmp_vendor.h>
-#include <sa/tasks/isakmp_delete.h>
+#include <sa/ikev2/tasks/ike_init.h>
+#include <sa/ikev2/tasks/ike_natd.h>
+#include <sa/ikev2/tasks/ike_mobike.h>
+#include <sa/ikev2/tasks/ike_auth.h>
+#include <sa/ikev2/tasks/ike_auth_lifetime.h>
+#include <sa/ikev2/tasks/ike_config.h>
+#include <sa/ikev2/tasks/ike_cert_pre.h>
+#include <sa/ikev2/tasks/ike_cert_post.h>
+#include <sa/ikev2/tasks/ike_rekey.h>
+#include <sa/ikev2/tasks/ike_reauth.h>
+#include <sa/ikev2/tasks/ike_delete.h>
+#include <sa/ikev2/tasks/ike_dpd.h>
+#include <sa/ikev2/tasks/ike_vendor.h>
+#include <sa/ikev2/tasks/child_create.h>
+#include <sa/ikev2/tasks/child_delete.h>
+#include <sa/ikev2/tasks/child_rekey.h>
+#include <sa/ikev1/tasks/main_mode.h>
+#include <sa/ikev1/tasks/isakmp_cert_pre.h>
+#include <sa/ikev1/tasks/isakmp_cert_post.h>
+#include <sa/ikev1/tasks/isakmp_natd.h>
+#include <sa/ikev1/tasks/quick_mode.h>
+#include <sa/ikev1/tasks/quick_delete.h>
+#include <sa/ikev1/tasks/isakmp_vendor.h>
+#include <sa/ikev1/tasks/isakmp_delete.h>
 #include <processing/jobs/retransmit_job.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 #include <processing/jobs/send_dpd_job.h>
@@ -59,7 +59,7 @@
 #include <processing/jobs/rekey_ike_sa_job.h>
 
 #ifdef ME
-#include <sa/tasks/ike_me.h>
+#include <sa/ikev2/tasks/ike_me.h>
 #include <processing/jobs/initiate_mediation_job.h>
 #endif
 

diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
index cbb16ca4ad2ee936b42f2af43113adb420b33e03..e5035645178b4fcce45aec95acb6f0f324555eb4 100644 (file)
--- a/src/libcharon/sa/ike_sa.h
+++ b/src/libcharon/sa/ike_sa.h
@@ -37,7 +37,7 @@ typedef struct ike_sa_t ike_sa_t;
 #include <encoding/payloads/configuration_attribute.h>
 #include <sa/ike_sa_id.h>
 #include <sa/child_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <sa/task_manager.h>
 #include <sa/keymat.h>
 #include <config/peer_cfg.h>

diff --git a/src/libcharon/sa/authenticators/hybrid_authenticator.c b/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.c
similarity index 100%
rename from src/libcharon/sa/authenticators/hybrid_authenticator.c
rename to src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.c

diff --git a/src/libcharon/sa/authenticators/hybrid_authenticator.h b/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
similarity index 97%
rename from src/libcharon/sa/authenticators/hybrid_authenticator.h
rename to src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
index 37057470bd3311ccdb126bd561d272a874aaf944..6a0bb1e59f9ef466ac3ea87b699461a117b8cb20 100644 (file)
--- a/src/libcharon/sa/authenticators/hybrid_authenticator.h
+++ b/src/libcharon/sa/ikev1/authenticators/hybrid_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct hybrid_authenticator_t hybrid_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using IKEv1 hybrid authentication.

diff --git a/src/libcharon/sa/authenticators/psk_v1_authenticator.c b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.c
similarity index 99%
rename from src/libcharon/sa/authenticators/psk_v1_authenticator.c
rename to src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.c
index 11fd8118d165d392bc4d5511a4797a60e2dd5efc..ce794a286bf422670a5e9a29d5b2444136a0f4ad 100644 (file)
--- a/src/libcharon/sa/authenticators/psk_v1_authenticator.c
+++ b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.c
@@ -16,7 +16,7 @@
 #include "psk_v1_authenticator.h"
 
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <encoding/payloads/hash_payload.h>
 
 typedef struct private_psk_v1_authenticator_t private_psk_v1_authenticator_t;

diff --git a/src/libcharon/sa/authenticators/psk_v1_authenticator.h b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
similarity index 97%
rename from src/libcharon/sa/authenticators/psk_v1_authenticator.h
rename to src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
index e01d49c956720ea66cfa15eaa17caabb97723a89..194b964569c707bf435c02287150d214e2529933 100644 (file)
--- a/src/libcharon/sa/authenticators/psk_v1_authenticator.h
+++ b/src/libcharon/sa/ikev1/authenticators/psk_v1_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct psk_v1_authenticator_t psk_v1_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using pre-shared keys for IKEv1.

diff --git a/src/libcharon/sa/authenticators/pubkey_v1_authenticator.c b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.c
similarity index 99%
rename from src/libcharon/sa/authenticators/pubkey_v1_authenticator.c
rename to src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.c
index 7da1953afb414940af1915617c04a490a820259d..56fcf2c9dfa0caf0648846b036db25043941ca07 100644 (file)
--- a/src/libcharon/sa/authenticators/pubkey_v1_authenticator.c
+++ b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.c
@@ -16,7 +16,7 @@
 #include "pubkey_v1_authenticator.h"
 
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <encoding/payloads/hash_payload.h>
 
 typedef struct private_pubkey_v1_authenticator_t private_pubkey_v1_authenticator_t;

diff --git a/src/libcharon/sa/authenticators/pubkey_v1_authenticator.h b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
similarity index 97%
rename from src/libcharon/sa/authenticators/pubkey_v1_authenticator.h
rename to src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
index e71a81f18ea51950006331cfb194e35b3c0945be..bafc3a2b2ef82ca0c02590d96e159b45d6f7b663 100644 (file)
--- a/src/libcharon/sa/authenticators/pubkey_v1_authenticator.h
+++ b/src/libcharon/sa/ikev1/authenticators/pubkey_v1_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct pubkey_v1_authenticator_t pubkey_v1_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using public keys for IKEv1.

diff --git a/src/libcharon/sa/authenticators/xauth/xauth_manager.c b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.c
similarity index 100%
rename from src/libcharon/sa/authenticators/xauth/xauth_manager.c
rename to src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.c

diff --git a/src/libcharon/sa/authenticators/xauth/xauth_manager.h b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.h
similarity index 97%
rename from src/libcharon/sa/authenticators/xauth/xauth_manager.h
rename to src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.h
index 7f07cc22a17780695438a175183c33fb4694bcf5..e7e84d06bd8922c7e78f65a9eb98db2daa6b5423 100644 (file)
--- a/src/libcharon/sa/authenticators/xauth/xauth_manager.h
+++ b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_manager.h
@@ -21,7 +21,7 @@
 #ifndef XAUTH_MANAGER_H_
 #define XAUTH_MANAGER_H_
 
-#include <sa/authenticators/xauth/xauth_method.h>
+#include <sa/ikev1/authenticators/xauth/xauth_method.h>
 
 typedef struct xauth_manager_t xauth_manager_t;
 

diff --git a/src/libcharon/sa/authenticators/xauth/xauth_method.c b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.c
similarity index 100%
rename from src/libcharon/sa/authenticators/xauth/xauth_method.c
rename to src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.c

diff --git a/src/libcharon/sa/authenticators/xauth/xauth_method.h b/src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.h
similarity index 100%
rename from src/libcharon/sa/authenticators/xauth/xauth_method.h
rename to src/libcharon/sa/ikev1/authenticators/xauth/xauth_method.h

diff --git a/src/libcharon/sa/keymat_v1.c b/src/libcharon/sa/ikev1/keymat_v1.c
similarity index 100%
rename from src/libcharon/sa/keymat_v1.c
rename to src/libcharon/sa/ikev1/keymat_v1.c

diff --git a/src/libcharon/sa/keymat_v1.h b/src/libcharon/sa/ikev1/keymat_v1.h
similarity index 99%
rename from src/libcharon/sa/keymat_v1.h
rename to src/libcharon/sa/ikev1/keymat_v1.h
index 875ad9d30176f0532b4f686b98c1d06d4029e7ca..bb1022b5e45f42f383de56660fb142747eb103a4 100644 (file)
--- a/src/libcharon/sa/keymat_v1.h
+++ b/src/libcharon/sa/ikev1/keymat_v1.h
@@ -22,6 +22,7 @@
 #define KEYMAT_V1_H_
 
 #include <sa/keymat.h>
+#include <sa/authenticator.h>
 
 typedef struct keymat_v1_t keymat_v1_t;
 

diff --git a/src/libcharon/sa/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
similarity index 98%
rename from src/libcharon/sa/task_manager_v1.c
rename to src/libcharon/sa/ikev1/task_manager_v1.c
index dea4dcb87d1e1469c90cd33c4ab857472755516d..8e4aa7496696df6004f5ad1866ccca9fbb3323dc 100644 (file)
--- a/src/libcharon/sa/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -19,15 +19,15 @@
 #include <math.h>
 
 #include <daemon.h>
-#include <sa/tasks/main_mode.h>
-#include <sa/tasks/quick_mode.h>
-#include <sa/tasks/xauth.h>
-#include <sa/tasks/mode_config.h>
-#include <sa/tasks/informational.h>
-#include <sa/tasks/isakmp_natd.h>
-#include <sa/tasks/isakmp_vendor.h>
-#include <sa/tasks/isakmp_cert_pre.h>
-#include <sa/tasks/isakmp_cert_post.h>
+#include <sa/ikev1/tasks/main_mode.h>
+#include <sa/ikev1/tasks/quick_mode.h>
+#include <sa/ikev1/tasks/xauth.h>
+#include <sa/ikev1/tasks/mode_config.h>
+#include <sa/ikev1/tasks/informational.h>
+#include <sa/ikev1/tasks/isakmp_natd.h>
+#include <sa/ikev1/tasks/isakmp_vendor.h>
+#include <sa/ikev1/tasks/isakmp_cert_pre.h>
+#include <sa/ikev1/tasks/isakmp_cert_post.h>
 #include <processing/jobs/retransmit_job.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 

diff --git a/src/libcharon/sa/task_manager_v1.h b/src/libcharon/sa/ikev1/task_manager_v1.h
similarity index 100%
rename from src/libcharon/sa/task_manager_v1.h
rename to src/libcharon/sa/ikev1/task_manager_v1.h

diff --git a/src/libcharon/sa/tasks/informational.c b/src/libcharon/sa/ikev1/tasks/informational.c
similarity index 98%
rename from src/libcharon/sa/tasks/informational.c
rename to src/libcharon/sa/ikev1/tasks/informational.c
index 5b2ceca8459500816c4b0d4d2c8c133bb5e2f48b..9de5c2e71e9c03c5058e766e1631fffac0d1c054 100644 (file)
--- a/src/libcharon/sa/tasks/informational.c
+++ b/src/libcharon/sa/ikev1/tasks/informational.c
@@ -16,8 +16,8 @@
 #include "informational.h"
 
 #include <daemon.h>
-#include <sa/tasks/isakmp_delete.h>
-#include <sa/tasks/quick_delete.h>
+#include <sa/ikev1/tasks/isakmp_delete.h>
+#include <sa/ikev1/tasks/quick_delete.h>
 #include <encoding/payloads/delete_payload.h>
 
 typedef struct private_informational_t private_informational_t;

diff --git a/src/libcharon/sa/tasks/informational.h b/src/libcharon/sa/ikev1/tasks/informational.h
similarity index 98%
rename from src/libcharon/sa/tasks/informational.h
rename to src/libcharon/sa/ikev1/tasks/informational.h
index 2aec7abd8d493a45bec65b756e50de2bee5eb59d..f1543dc58b0c14645ea98d26003be26272c8a868 100644 (file)
--- a/src/libcharon/sa/tasks/informational.h
+++ b/src/libcharon/sa/ikev1/tasks/informational.h
@@ -25,7 +25,7 @@ typedef struct informational_t informational_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <encoding/payloads/notify_payload.h>
 
 /**

diff --git a/src/libcharon/sa/tasks/isakmp_cert_post.c b/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.c
similarity index 100%
rename from src/libcharon/sa/tasks/isakmp_cert_post.c
rename to src/libcharon/sa/ikev1/tasks/isakmp_cert_post.c

diff --git a/src/libcharon/sa/tasks/isakmp_cert_post.h b/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h
similarity index 98%
rename from src/libcharon/sa/tasks/isakmp_cert_post.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h
index 6720c54e008b7cf6359f70503a1f3e32617b07b3..2e38df89ff090973d0b33fe4d200688c37df2df3 100644 (file)
--- a/src/libcharon/sa/tasks/isakmp_cert_post.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_cert_post.h
@@ -25,7 +25,7 @@ typedef struct isakmp_cert_post_t isakmp_cert_post_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * ISAKMP_CERT_POST, IKEv1 certificate processing after authentication.

diff --git a/src/libcharon/sa/tasks/isakmp_cert_pre.c b/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.c
similarity index 100%
rename from src/libcharon/sa/tasks/isakmp_cert_pre.c
rename to src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.c

diff --git a/src/libcharon/sa/tasks/isakmp_cert_pre.h b/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h
similarity index 98%
rename from src/libcharon/sa/tasks/isakmp_cert_pre.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h
index c6dc98ac5e2596df5490d50f57cb7d1b5307b40f..908cff020bbbfedbfec4063091911c90bc64dd54 100644 (file)
--- a/src/libcharon/sa/tasks/isakmp_cert_pre.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_cert_pre.h
@@ -25,7 +25,7 @@ typedef struct isakmp_cert_pre_t isakmp_cert_pre_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * ISAKMP_CERT_PRE task, IKEv1 certificate processing before authentication.

diff --git a/src/libcharon/sa/tasks/isakmp_delete.c b/src/libcharon/sa/ikev1/tasks/isakmp_delete.c
similarity index 100%
rename from src/libcharon/sa/tasks/isakmp_delete.c
rename to src/libcharon/sa/ikev1/tasks/isakmp_delete.c

diff --git a/src/libcharon/sa/tasks/isakmp_delete.h b/src/libcharon/sa/ikev1/tasks/isakmp_delete.h
similarity index 97%
rename from src/libcharon/sa/tasks/isakmp_delete.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_delete.h
index 49e49fab94aadd52abaa981f2a18e7c0d440f6f0..3b7b40c116c081719b80aa1619deb8d85b99ab4d 100644 (file)
--- a/src/libcharon/sa/tasks/isakmp_delete.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_delete.h
@@ -25,7 +25,7 @@ typedef struct isakmp_delete_t isakmp_delete_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ISAKMP_DELETE, delete an IKEv1 IKE_SA.

diff --git a/src/libcharon/sa/tasks/isakmp_natd.c b/src/libcharon/sa/ikev1/tasks/isakmp_natd.c
similarity index 99%
rename from src/libcharon/sa/tasks/isakmp_natd.c
rename to src/libcharon/sa/ikev1/tasks/isakmp_natd.c
index b956ff66fc8843bc443821a80261cb0864dc873b..88ee327badac60119eebdf31d8e31cb4463ac22f 100644 (file)
--- a/src/libcharon/sa/tasks/isakmp_natd.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_natd.c
@@ -21,7 +21,7 @@
 
 #include <hydra.h>
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <config/peer_cfg.h>
 #include <crypto/hashers/hasher.h>
 #include <encoding/payloads/hash_payload.h>

diff --git a/src/libcharon/sa/tasks/isakmp_natd.h b/src/libcharon/sa/ikev1/tasks/isakmp_natd.h
similarity index 97%
rename from src/libcharon/sa/tasks/isakmp_natd.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_natd.h
index 3d5df7e5a587fbb0ce5ebc89ab2633b5c5024bcb..b83b078056e58664f58aa9c19735c19b5012c9db 100644 (file)
--- a/src/libcharon/sa/tasks/isakmp_natd.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_natd.h
@@ -25,7 +25,7 @@ typedef struct isakmp_natd_t isakmp_natd_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ISAKMP_NATD, detects NAT situation in IKEv1 Phase 1.

diff --git a/src/libcharon/sa/tasks/isakmp_vendor.c b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c
similarity index 100%
rename from src/libcharon/sa/tasks/isakmp_vendor.c
rename to src/libcharon/sa/ikev1/tasks/isakmp_vendor.c

diff --git a/src/libcharon/sa/tasks/isakmp_vendor.h b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.h
similarity index 97%
rename from src/libcharon/sa/tasks/isakmp_vendor.h
rename to src/libcharon/sa/ikev1/tasks/isakmp_vendor.h
index e6ceb2e6d9959f59c8c0e1c5dd8fd13f2ef59d5f..b81d79034c1d5efe47032e8068a70054402e2629 100644 (file)
--- a/src/libcharon/sa/tasks/isakmp_vendor.h
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.h
@@ -25,7 +25,7 @@ typedef struct isakmp_vendor_t isakmp_vendor_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Vendor ID processing task for IKEv1.

diff --git a/src/libcharon/sa/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c
similarity index 99%
rename from src/libcharon/sa/tasks/main_mode.c
rename to src/libcharon/sa/ikev1/tasks/main_mode.c
index 08bb29124ae1bdc7209cefda75bee34ed196f59e..7f263260c7699ed39c04fa41dd1c5ffc7070f266 100644 (file)
--- a/src/libcharon/sa/tasks/main_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/main_mode.c
@@ -21,17 +21,17 @@
 #include <string.h>
 
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <crypto/diffie_hellman.h>
 #include <encoding/payloads/sa_payload.h>
 #include <encoding/payloads/ke_payload.h>
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/id_payload.h>
 #include <encoding/payloads/hash_payload.h>
-#include <sa/tasks/xauth.h>
-#include <sa/tasks/mode_config.h>
-#include <sa/tasks/informational.h>
-#include <sa/tasks/isakmp_delete.h>
+#include <sa/ikev1/tasks/xauth.h>
+#include <sa/ikev1/tasks/mode_config.h>
+#include <sa/ikev1/tasks/informational.h>
+#include <sa/ikev1/tasks/isakmp_delete.h>
 
 typedef struct private_main_mode_t private_main_mode_t;
 

diff --git a/src/libcharon/sa/tasks/main_mode.h b/src/libcharon/sa/ikev1/tasks/main_mode.h
similarity index 97%
rename from src/libcharon/sa/tasks/main_mode.h
rename to src/libcharon/sa/ikev1/tasks/main_mode.h
index 9ff253096e4c2438d0ed16fe22fa2f8eed695e83..d266b6e636f9db11c43ef48639fd1cc55a63b390 100644 (file)
--- a/src/libcharon/sa/tasks/main_mode.h
+++ b/src/libcharon/sa/ikev1/tasks/main_mode.h
@@ -25,7 +25,7 @@ typedef struct main_mode_t main_mode_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * IKEv1 main mode, establishes a mainmode including authentication.

diff --git a/src/libcharon/sa/tasks/mode_config.c b/src/libcharon/sa/ikev1/tasks/mode_config.c
similarity index 100%
rename from src/libcharon/sa/tasks/mode_config.c
rename to src/libcharon/sa/ikev1/tasks/mode_config.c

diff --git a/src/libcharon/sa/tasks/mode_config.h b/src/libcharon/sa/ikev1/tasks/mode_config.h
similarity index 97%
rename from src/libcharon/sa/tasks/mode_config.h
rename to src/libcharon/sa/ikev1/tasks/mode_config.h
index 34b744d1004ac905c6b6f45d90934fa27a7f181a..026545eba17a4381e359c02a487e0e4e8811149c 100644 (file)
--- a/src/libcharon/sa/tasks/mode_config.h
+++ b/src/libcharon/sa/ikev1/tasks/mode_config.h
@@ -25,7 +25,7 @@ typedef struct mode_config_t mode_config_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_MODE_COFNIG, IKEv1 configuration attribute exchange.

diff --git a/src/libcharon/sa/tasks/quick_delete.c b/src/libcharon/sa/ikev1/tasks/quick_delete.c
similarity index 100%
rename from src/libcharon/sa/tasks/quick_delete.c
rename to src/libcharon/sa/ikev1/tasks/quick_delete.c

diff --git a/src/libcharon/sa/tasks/quick_delete.h b/src/libcharon/sa/ikev1/tasks/quick_delete.h
similarity index 98%
rename from src/libcharon/sa/tasks/quick_delete.h
rename to src/libcharon/sa/ikev1/tasks/quick_delete.h
index 80aae8273960a1f826cce4134b76d3b9bc2ed04e..1cdf07c4883aacb29d5ff87637566dcae4e6b67b 100644 (file)
--- a/src/libcharon/sa/tasks/quick_delete.h
+++ b/src/libcharon/sa/ikev1/tasks/quick_delete.h
@@ -25,7 +25,7 @@ typedef struct quick_delete_t quick_delete_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <sa/child_sa.h>
 
 /**

diff --git a/src/libcharon/sa/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
similarity index 99%
rename from src/libcharon/sa/tasks/quick_mode.c
rename to src/libcharon/sa/ikev1/tasks/quick_mode.c
index 9d9b5e95833840307e76d5e02ff13c5ac6389be1..9e71642af23448975e3721c25f54df2bcd04e23c 100644 (file)
--- a/src/libcharon/sa/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -18,14 +18,14 @@
 #include <string.h>
 
 #include <daemon.h>
-#include <sa/keymat_v1.h>
+#include <sa/ikev1/keymat_v1.h>
 #include <encoding/payloads/sa_payload.h>
 #include <encoding/payloads/nonce_payload.h>
 #include <encoding/payloads/ke_payload.h>
 #include <encoding/payloads/id_payload.h>
 #include <encoding/payloads/payload.h>
-#include <sa/tasks/informational.h>
-#include <sa/tasks/quick_delete.h>
+#include <sa/ikev1/tasks/informational.h>
+#include <sa/ikev1/tasks/quick_delete.h>
 
 typedef struct private_quick_mode_t private_quick_mode_t;
 

diff --git a/src/libcharon/sa/tasks/quick_mode.h b/src/libcharon/sa/ikev1/tasks/quick_mode.h
similarity index 98%
rename from src/libcharon/sa/tasks/quick_mode.h
rename to src/libcharon/sa/ikev1/tasks/quick_mode.h
index e50c1a97ee60aaff69f22163b0787299e95b5500..82790c7683a160019e7201f15973caf618756717 100644 (file)
--- a/src/libcharon/sa/tasks/quick_mode.h
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.h
@@ -25,7 +25,7 @@ typedef struct quick_mode_t quick_mode_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * IKEv1 quick mode, establishes a CHILD_SA in IKEv1.

diff --git a/src/libcharon/sa/tasks/xauth.c b/src/libcharon/sa/ikev1/tasks/xauth.c
similarity index 100%
rename from src/libcharon/sa/tasks/xauth.c
rename to src/libcharon/sa/ikev1/tasks/xauth.c

diff --git a/src/libcharon/sa/tasks/xauth.h b/src/libcharon/sa/ikev1/tasks/xauth.h
similarity index 97%
rename from src/libcharon/sa/tasks/xauth.h
rename to src/libcharon/sa/ikev1/tasks/xauth.h
index 6633f9e557ad49be248a351af4ad97d005e6573c..c1528ccbe0083bc350a3199081e04527bb67f7d3 100644 (file)
--- a/src/libcharon/sa/tasks/xauth.h
+++ b/src/libcharon/sa/ikev1/tasks/xauth.h
@@ -25,7 +25,7 @@ typedef struct xauth_t xauth_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_XAUTH, additional authentication after main/aggressive mode.

diff --git a/src/libcharon/sa/authenticators/eap/eap_manager.c b/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.c
similarity index 99%
rename from src/libcharon/sa/authenticators/eap/eap_manager.c
rename to src/libcharon/sa/ikev2/authenticators/eap/eap_manager.c
index bc2c4a617053fa8d98da42135b37ca2f5baab2b4..d38754e0131b444cb1cddc34e6f8b9d2a4b8a0e8 100644 (file)
--- a/src/libcharon/sa/authenticators/eap/eap_manager.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.c
@@ -159,4 +159,3 @@ eap_manager_t *eap_manager_create()
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/authenticators/eap/eap_manager.h b/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.h
similarity index 98%
rename from src/libcharon/sa/authenticators/eap/eap_manager.h
rename to src/libcharon/sa/ikev2/authenticators/eap/eap_manager.h
index 0333fb6daaba6a55569cd9941ac7e2641f84b095..6b875463430fbc1d351f98161843282c923e6831 100644 (file)
--- a/src/libcharon/sa/authenticators/eap/eap_manager.h
+++ b/src/libcharon/sa/ikev2/authenticators/eap/eap_manager.h
@@ -21,7 +21,7 @@
 #ifndef EAP_MANAGER_H_
 #define EAP_MANAGER_H_
 
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 
 typedef struct eap_manager_t eap_manager_t;
 

diff --git a/src/libcharon/sa/authenticators/eap/eap_method.c b/src/libcharon/sa/ikev2/authenticators/eap/eap_method.c
similarity index 100%
rename from src/libcharon/sa/authenticators/eap/eap_method.c
rename to src/libcharon/sa/ikev2/authenticators/eap/eap_method.c

diff --git a/src/libcharon/sa/authenticators/eap/eap_method.h b/src/libcharon/sa/ikev2/authenticators/eap/eap_method.h
similarity index 100%
rename from src/libcharon/sa/authenticators/eap/eap_method.h
rename to src/libcharon/sa/ikev2/authenticators/eap/eap_method.h

diff --git a/src/libcharon/sa/authenticators/eap_authenticator.c b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
similarity index 99%
rename from src/libcharon/sa/authenticators/eap_authenticator.c
rename to src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
index d36d544e873ba6b189b2692f6df8c76be30f8da6..462436d805fea9143b2dc86341c73db7b8e7f812 100644 (file)
--- a/src/libcharon/sa/authenticators/eap_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.c
@@ -16,8 +16,8 @@
 #include "eap_authenticator.h"
 
 #include <daemon.h>
-#include <sa/keymat_v2.h>
-#include <sa/authenticators/eap/eap_method.h>
+#include <sa/ikev2/keymat_v2.h>
+#include <sa/ikev2/authenticators/eap/eap_method.h>
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/eap_payload.h>
 
@@ -707,4 +707,3 @@ eap_authenticator_t *eap_authenticator_create_verifier(ike_sa_t *ike_sa,
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/authenticators/eap_authenticator.h b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.h
similarity index 98%
rename from src/libcharon/sa/authenticators/eap_authenticator.h
rename to src/libcharon/sa/ikev2/authenticators/eap_authenticator.h
index 726411a18060e5e83aaf26171fec1fa9ecd458f5..15d7cb88d09e166a515c9e128225d46c52d14505 100644 (file)
--- a/src/libcharon/sa/authenticators/eap_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/eap_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct eap_authenticator_t eap_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using EAP authentication.

diff --git a/src/libcharon/sa/authenticators/psk_authenticator.c b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.c
similarity index 99%
rename from src/libcharon/sa/authenticators/psk_authenticator.c
rename to src/libcharon/sa/ikev2/authenticators/psk_authenticator.c
index 26c722530a53bb4a0dd4ae9956e4644b75ad2edf..2d3434cdf101f397e355c0bb882943f64f13dc1d 100644 (file)
--- a/src/libcharon/sa/authenticators/psk_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.c
@@ -18,7 +18,7 @@
 
 #include <daemon.h>
 #include <encoding/payloads/auth_payload.h>
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 
 typedef struct private_psk_authenticator_t private_psk_authenticator_t;
 
@@ -202,4 +202,3 @@ psk_authenticator_t *psk_authenticator_create_verifier(ike_sa_t *ike_sa,
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/authenticators/psk_authenticator.h b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.h
similarity index 97%
rename from src/libcharon/sa/authenticators/psk_authenticator.h
rename to src/libcharon/sa/ikev2/authenticators/psk_authenticator.h
index 8cf1a0f98ed0d41a395b008de4f0da3e0483a5ad..ffd06f1bc6144e80383c0d9d8992ef946f457b64 100644 (file)
--- a/src/libcharon/sa/authenticators/psk_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/psk_authenticator.h
@@ -23,7 +23,7 @@
 
 typedef struct psk_authenticator_t psk_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using pre-shared keys.

diff --git a/src/libcharon/sa/authenticators/pubkey_authenticator.c b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
similarity index 99%
rename from src/libcharon/sa/authenticators/pubkey_authenticator.c
rename to src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
index df5b06ae6ee4a8c5a957121865b841502aa22b2b..179be39777a12a7d7b528f7852669df6e94639e5 100644 (file)
--- a/src/libcharon/sa/authenticators/pubkey_authenticator.c
+++ b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.c
@@ -19,7 +19,7 @@
 
 #include <daemon.h>
 #include <encoding/payloads/auth_payload.h>
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 
 typedef struct private_pubkey_authenticator_t private_pubkey_authenticator_t;
 

diff --git a/src/libcharon/sa/authenticators/pubkey_authenticator.h b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
similarity index 97%
rename from src/libcharon/sa/authenticators/pubkey_authenticator.h
rename to src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
index 4c3937ecc19a71f6a058a3d4b744db8ff57ec6ae..bf95d6efd5ccb85f546a67b2a88b8b3ed02031a6 100644 (file)
--- a/src/libcharon/sa/authenticators/pubkey_authenticator.h
+++ b/src/libcharon/sa/ikev2/authenticators/pubkey_authenticator.h
@@ -24,7 +24,7 @@
 
 typedef struct pubkey_authenticator_t pubkey_authenticator_t;
 
-#include <sa/authenticators/authenticator.h>
+#include <sa/authenticator.h>
 
 /**
  * Implementation of authenticator_t using public key authenitcation.

diff --git a/src/libcharon/sa/connect_manager.c b/src/libcharon/sa/ikev2/connect_manager.c
similarity index 100%
rename from src/libcharon/sa/connect_manager.c
rename to src/libcharon/sa/ikev2/connect_manager.c

diff --git a/src/libcharon/sa/connect_manager.h b/src/libcharon/sa/ikev2/connect_manager.h
similarity index 100%
rename from src/libcharon/sa/connect_manager.h
rename to src/libcharon/sa/ikev2/connect_manager.h

diff --git a/src/libcharon/sa/keymat_v2.c b/src/libcharon/sa/ikev2/keymat_v2.c
similarity index 100%
rename from src/libcharon/sa/keymat_v2.c
rename to src/libcharon/sa/ikev2/keymat_v2.c

diff --git a/src/libcharon/sa/keymat_v2.h b/src/libcharon/sa/ikev2/keymat_v2.h
similarity index 100%
rename from src/libcharon/sa/keymat_v2.h
rename to src/libcharon/sa/ikev2/keymat_v2.h

diff --git a/src/libcharon/sa/mediation_manager.c b/src/libcharon/sa/ikev2/mediation_manager.c
similarity index 100%
rename from src/libcharon/sa/mediation_manager.c
rename to src/libcharon/sa/ikev2/mediation_manager.c

diff --git a/src/libcharon/sa/mediation_manager.h b/src/libcharon/sa/ikev2/mediation_manager.h
similarity index 100%
rename from src/libcharon/sa/mediation_manager.h
rename to src/libcharon/sa/ikev2/mediation_manager.h

diff --git a/src/libcharon/sa/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
similarity index 98%
rename from src/libcharon/sa/task_manager_v2.c
rename to src/libcharon/sa/ikev2/task_manager_v2.c
index 57b485ac5076173045d205041263dec8c3f38427..cce9551d5da1235cdaf6244ab123907a38813f6a 100644 (file)
--- a/src/libcharon/sa/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -19,28 +19,28 @@
 #include <math.h>
 
 #include <daemon.h>
-#include <sa/tasks/ike_init.h>
-#include <sa/tasks/ike_natd.h>
-#include <sa/tasks/ike_mobike.h>
-#include <sa/tasks/ike_auth.h>
-#include <sa/tasks/ike_auth_lifetime.h>
-#include <sa/tasks/ike_cert_pre.h>
-#include <sa/tasks/ike_cert_post.h>
-#include <sa/tasks/ike_rekey.h>
-#include <sa/tasks/ike_delete.h>
-#include <sa/tasks/ike_config.h>
-#include <sa/tasks/ike_dpd.h>
-#include <sa/tasks/ike_vendor.h>
-#include <sa/tasks/child_create.h>
-#include <sa/tasks/child_rekey.h>
-#include <sa/tasks/child_delete.h>
+#include <sa/ikev2/tasks/ike_init.h>
+#include <sa/ikev2/tasks/ike_natd.h>
+#include <sa/ikev2/tasks/ike_mobike.h>
+#include <sa/ikev2/tasks/ike_auth.h>
+#include <sa/ikev2/tasks/ike_auth_lifetime.h>
+#include <sa/ikev2/tasks/ike_cert_pre.h>
+#include <sa/ikev2/tasks/ike_cert_post.h>
+#include <sa/ikev2/tasks/ike_rekey.h>
+#include <sa/ikev2/tasks/ike_delete.h>
+#include <sa/ikev2/tasks/ike_config.h>
+#include <sa/ikev2/tasks/ike_dpd.h>
+#include <sa/ikev2/tasks/ike_vendor.h>
+#include <sa/ikev2/tasks/child_create.h>
+#include <sa/ikev2/tasks/child_rekey.h>
+#include <sa/ikev2/tasks/child_delete.h>
 #include <encoding/payloads/delete_payload.h>
 #include <encoding/payloads/unknown_payload.h>
 #include <processing/jobs/retransmit_job.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 
 #ifdef ME
-#include <sa/tasks/ike_me.h>
+#include <sa/ikev2/tasks/ike_me.h>
 #endif
 
 typedef struct exchange_t exchange_t;

diff --git a/src/libcharon/sa/task_manager_v2.h b/src/libcharon/sa/ikev2/task_manager_v2.h
similarity index 100%
rename from src/libcharon/sa/task_manager_v2.h
rename to src/libcharon/sa/ikev2/task_manager_v2.h

diff --git a/src/libcharon/sa/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c
similarity index 99%
rename from src/libcharon/sa/tasks/child_create.c
rename to src/libcharon/sa/ikev2/tasks/child_create.c
index 79d0821382401ed23788c694665dd5dbfbeee19e..023334bd43bfa7aec08761488724bc157028a1ea 100644 (file)
--- a/src/libcharon/sa/tasks/child_create.c
+++ b/src/libcharon/sa/ikev2/tasks/child_create.c
@@ -18,7 +18,7 @@
 #include "child_create.h"
 
 #include <daemon.h>
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 #include <crypto/diffie_hellman.h>
 #include <credentials/certificates/x509.h>
 #include <encoding/payloads/sa_payload.h>

diff --git a/src/libcharon/sa/tasks/child_create.h b/src/libcharon/sa/ikev2/tasks/child_create.h
similarity index 98%
rename from src/libcharon/sa/tasks/child_create.h
rename to src/libcharon/sa/ikev2/tasks/child_create.h
index fdec3bbb9f9d2f14f5ea04535868c51791ff58b9..938b843982f8fce7f76b9df23311fda4024af5fd 100644 (file)
--- a/src/libcharon/sa/tasks/child_create.h
+++ b/src/libcharon/sa/ikev2/tasks/child_create.h
@@ -25,7 +25,7 @@ typedef struct child_create_t child_create_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <config/child_cfg.h>
 
 /**

diff --git a/src/libcharon/sa/tasks/child_delete.c b/src/libcharon/sa/ikev2/tasks/child_delete.c
similarity index 100%
rename from src/libcharon/sa/tasks/child_delete.c
rename to src/libcharon/sa/ikev2/tasks/child_delete.c

diff --git a/src/libcharon/sa/tasks/child_delete.h b/src/libcharon/sa/ikev2/tasks/child_delete.h
similarity index 98%
rename from src/libcharon/sa/tasks/child_delete.h
rename to src/libcharon/sa/ikev2/tasks/child_delete.h
index 365807c687c8b9943eb684809c913adafdd33426..34d399ce3b1b57daab39b21e96318983215a7d39 100644 (file)
--- a/src/libcharon/sa/tasks/child_delete.h
+++ b/src/libcharon/sa/ikev2/tasks/child_delete.h
@@ -25,7 +25,7 @@ typedef struct child_delete_t child_delete_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <sa/child_sa.h>
 
 /**

diff --git a/src/libcharon/sa/tasks/child_rekey.c b/src/libcharon/sa/ikev2/tasks/child_rekey.c
similarity index 99%
rename from src/libcharon/sa/tasks/child_rekey.c
rename to src/libcharon/sa/ikev2/tasks/child_rekey.c
index fa916c4e50f843f8fdc4551f1b03ee714c592cff..50a8aad959cb1b2bd775219d0ebfa6913cc76b1f 100644 (file)
--- a/src/libcharon/sa/tasks/child_rekey.c
+++ b/src/libcharon/sa/ikev2/tasks/child_rekey.c
@@ -18,8 +18,8 @@
 
 #include <daemon.h>
 #include <encoding/payloads/notify_payload.h>
-#include <sa/tasks/child_create.h>
-#include <sa/tasks/child_delete.h>
+#include <sa/ikev2/tasks/child_create.h>
+#include <sa/ikev2/tasks/child_delete.h>
 #include <processing/jobs/rekey_child_sa_job.h>
 #include <processing/jobs/rekey_ike_sa_job.h>
 

diff --git a/src/libcharon/sa/tasks/child_rekey.h b/src/libcharon/sa/ikev2/tasks/child_rekey.h
similarity index 98%
rename from src/libcharon/sa/tasks/child_rekey.h
rename to src/libcharon/sa/ikev2/tasks/child_rekey.h
index 3ba4176111b2bb682f57e9df5a47af90101190ce..78314b0f9a8330360428d8c63a9ec12c7c8030d1 100644 (file)
--- a/src/libcharon/sa/tasks/child_rekey.h
+++ b/src/libcharon/sa/ikev2/tasks/child_rekey.h
@@ -26,7 +26,7 @@ typedef struct child_rekey_t child_rekey_t;
 #include <library.h>
 #include <sa/ike_sa.h>
 #include <sa/child_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_CHILD_REKEY, rekey an established CHILD_SA.

diff --git a/src/libcharon/sa/tasks/ike_auth.c b/src/libcharon/sa/ikev2/tasks/ike_auth.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_auth.c
rename to src/libcharon/sa/ikev2/tasks/ike_auth.c
index f9cf5c61319584b17ff4882910be431d1eceeaee..183ca34404bc5eb74300ea773736cb78f04fe737 100644 (file)
--- a/src/libcharon/sa/tasks/ike_auth.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth.c
@@ -23,7 +23,7 @@
 #include <encoding/payloads/auth_payload.h>
 #include <encoding/payloads/eap_payload.h>
 #include <encoding/payloads/nonce_payload.h>
-#include <sa/authenticators/eap_authenticator.h>
+#include <sa/ikev2/authenticators/eap_authenticator.h>
 
 typedef struct private_ike_auth_t private_ike_auth_t;
 
@@ -1096,4 +1096,3 @@ ike_auth_t *ike_auth_create(ike_sa_t *ike_sa, bool initiator)
        }
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/tasks/ike_auth.h b/src/libcharon/sa/ikev2/tasks/ike_auth.h
similarity index 98%
rename from src/libcharon/sa/tasks/ike_auth.h
rename to src/libcharon/sa/ikev2/tasks/ike_auth.h
index c6c0100b055b565f75f96134027acf3584bf2620..cf507f8e6f7a27564c48d2c571ed01e45e581a02 100644 (file)
--- a/src/libcharon/sa/tasks/ike_auth.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth.h
@@ -25,7 +25,7 @@ typedef struct ike_auth_t ike_auth_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_auth, authenticates an IKE_SA using authenticators.

diff --git a/src/libcharon/sa/tasks/ike_auth_lifetime.c b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_auth_lifetime.c
rename to src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.c
index 31e3bffca56b698bcb2bb0daa7638113d502ba58..a7d162e682eafd999d554a9a9de4736b6262e185 100644 (file)
--- a/src/libcharon/sa/tasks/ike_auth_lifetime.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.c
@@ -170,4 +170,3 @@ ike_auth_lifetime_t *ike_auth_lifetime_create(ike_sa_t *ike_sa, bool initiator)
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/tasks/ike_auth_lifetime.h b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h
similarity index 98%
rename from src/libcharon/sa/tasks/ike_auth_lifetime.h
rename to src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h
index 9052f42746854862dd3b0baeb8bb0ef9c80fa816..5259beb2a5bc7e26dd31b133b88e28e9c49a517a 100644 (file)
--- a/src/libcharon/sa/tasks/ike_auth_lifetime.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_auth_lifetime.h
@@ -25,7 +25,7 @@ typedef struct ike_auth_lifetime_t ike_auth_lifetime_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_AUTH_LIFETIME, implements RFC4478.

diff --git a/src/libcharon/sa/tasks/ike_cert_post.c b/src/libcharon/sa/ikev2/tasks/ike_cert_post.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_cert_post.c
rename to src/libcharon/sa/ikev2/tasks/ike_cert_post.c
index bedf323ff10d503748a3eac98a2124f8b8859221..10bb4d19be44de7797f56d73abcad6dd14594ca1 100644 (file)
--- a/src/libcharon/sa/tasks/ike_cert_post.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_cert_post.c
@@ -254,4 +254,3 @@ ike_cert_post_t *ike_cert_post_create(ike_sa_t *ike_sa, bool initiator)
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/tasks/ike_cert_post.h b/src/libcharon/sa/ikev2/tasks/ike_cert_post.h
similarity index 98%
rename from src/libcharon/sa/tasks/ike_cert_post.h
rename to src/libcharon/sa/ikev2/tasks/ike_cert_post.h
index b3881a01ae52322fb4f0ac48d207a166db5c3f8c..61d4c2d822f59af9f11f2a518f071123bef16237 100644 (file)
--- a/src/libcharon/sa/tasks/ike_cert_post.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_cert_post.h
@@ -25,7 +25,7 @@ typedef struct ike_cert_post_t ike_cert_post_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_cert_post, certificate processing after authentication.

diff --git a/src/libcharon/sa/tasks/ike_cert_pre.c b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.c
similarity index 100%
rename from src/libcharon/sa/tasks/ike_cert_pre.c
rename to src/libcharon/sa/ikev2/tasks/ike_cert_pre.c

diff --git a/src/libcharon/sa/tasks/ike_cert_pre.h b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.h
similarity index 98%
rename from src/libcharon/sa/tasks/ike_cert_pre.h
rename to src/libcharon/sa/ikev2/tasks/ike_cert_pre.h
index 4b2d0d4703593ca8cc1e5fc4cc8358b499c67764..7de1f3271078ced8558ff028c9995b626b16f8e0 100644 (file)
--- a/src/libcharon/sa/tasks/ike_cert_pre.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_cert_pre.h
@@ -25,7 +25,7 @@ typedef struct ike_cert_pre_t ike_cert_pre_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_cert_post, certificate processing before authentication.

diff --git a/src/libcharon/sa/tasks/ike_config.c b/src/libcharon/sa/ikev2/tasks/ike_config.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_config.c
rename to src/libcharon/sa/ikev2/tasks/ike_config.c
index 332af465bb5d35ad88603a92278217a6e711aa95..da530a007c2e4266285f3593639dd4a2ef231abd 100644 (file)
--- a/src/libcharon/sa/tasks/ike_config.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_config.c
@@ -443,4 +443,3 @@ ike_config_t *ike_config_create(ike_sa_t *ike_sa, bool initiator)
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/tasks/ike_config.h b/src/libcharon/sa/ikev2/tasks/ike_config.h
similarity index 97%
rename from src/libcharon/sa/tasks/ike_config.h
rename to src/libcharon/sa/ikev2/tasks/ike_config.h
index d343761c119c158e34e615bc0def534a5cc4d9ce..239e35c43b3191aa13832c7c005c380b8c009728 100644 (file)
--- a/src/libcharon/sa/tasks/ike_config.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_config.h
@@ -25,7 +25,7 @@ typedef struct ike_config_t ike_config_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_CONFIG, sets up a virtual IP and other

diff --git a/src/libcharon/sa/tasks/ike_delete.c b/src/libcharon/sa/ikev2/tasks/ike_delete.c
similarity index 100%
rename from src/libcharon/sa/tasks/ike_delete.c
rename to src/libcharon/sa/ikev2/tasks/ike_delete.c

diff --git a/src/libcharon/sa/tasks/ike_delete.h b/src/libcharon/sa/ikev2/tasks/ike_delete.h
similarity index 97%
rename from src/libcharon/sa/tasks/ike_delete.h
rename to src/libcharon/sa/ikev2/tasks/ike_delete.h
index 82782f3939092929fff99d3ec5ce8cdd794ebb5f..039e068e6dfd1eb4728a87ae43361e8df928198a 100644 (file)
--- a/src/libcharon/sa/tasks/ike_delete.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_delete.h
@@ -25,7 +25,7 @@ typedef struct ike_delete_t ike_delete_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_delete, delete an IKE_SA.

diff --git a/src/libcharon/sa/tasks/ike_dpd.c b/src/libcharon/sa/ikev2/tasks/ike_dpd.c
similarity index 100%
rename from src/libcharon/sa/tasks/ike_dpd.c
rename to src/libcharon/sa/ikev2/tasks/ike_dpd.c

diff --git a/src/libcharon/sa/tasks/ike_dpd.h b/src/libcharon/sa/ikev2/tasks/ike_dpd.h
similarity index 97%
rename from src/libcharon/sa/tasks/ike_dpd.h
rename to src/libcharon/sa/ikev2/tasks/ike_dpd.h
index a9f68c31cd0ad8a990812662645877af72019060..586557232649cf4b2564ddc57f9acfcb2e496cb2 100644 (file)
--- a/src/libcharon/sa/tasks/ike_dpd.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_dpd.h
@@ -25,7 +25,7 @@ typedef struct ike_dpd_t ike_dpd_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_dpd, detects dead peers.

diff --git a/src/libcharon/sa/tasks/ike_init.c b/src/libcharon/sa/ikev2/tasks/ike_init.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_init.c
rename to src/libcharon/sa/ikev2/tasks/ike_init.c
index 3b0c4e8f8786befe59ed8a9bcce15c9517fcd8fc..ceae484d0b183e1d76d2acd8bd19a8acedc4ed1d 100644 (file)
--- a/src/libcharon/sa/tasks/ike_init.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_init.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include <daemon.h>
-#include <sa/keymat_v2.h>
+#include <sa/ikev2/keymat_v2.h>
 #include <crypto/diffie_hellman.h>
 #include <encoding/payloads/sa_payload.h>
 #include <encoding/payloads/ke_payload.h>

diff --git a/src/libcharon/sa/tasks/ike_init.h b/src/libcharon/sa/ikev2/tasks/ike_init.h
similarity index 98%
rename from src/libcharon/sa/tasks/ike_init.h
rename to src/libcharon/sa/ikev2/tasks/ike_init.h
index 6855ac8394e206a991baf07fe00d0a48735d9d18..aa3cfa8a94a5edd61fef16f677856e369529d75c 100644 (file)
--- a/src/libcharon/sa/tasks/ike_init.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_init.h
@@ -25,7 +25,7 @@ typedef struct ike_init_t ike_init_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_INIT, creates an IKE_SA without authentication.

diff --git a/src/libcharon/sa/tasks/ike_me.c b/src/libcharon/sa/ikev2/tasks/ike_me.c
similarity index 100%
rename from src/libcharon/sa/tasks/ike_me.c
rename to src/libcharon/sa/ikev2/tasks/ike_me.c

diff --git a/src/libcharon/sa/tasks/ike_me.h b/src/libcharon/sa/ikev2/tasks/ike_me.h
similarity index 99%
rename from src/libcharon/sa/tasks/ike_me.h
rename to src/libcharon/sa/ikev2/tasks/ike_me.h
index 74dd1dedf401c89553d6ca766a81964899e8092c..a7fe0c5887b4304ca131d35cd4c110cb790ce4fd 100644 (file)
--- a/src/libcharon/sa/tasks/ike_me.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_me.h
@@ -25,7 +25,7 @@ typedef struct ike_me_t ike_me_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_ME, detects and handles IKE-ME extensions.

diff --git a/src/libcharon/sa/tasks/ike_mobike.c b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_mobike.c
rename to src/libcharon/sa/ikev2/tasks/ike_mobike.c
index 6719bddd6b9fdfda165a12aecfc0fb8cfa82ac4f..c533506bb3fc1a185df919834d445bb2df2f02cf 100644 (file)
--- a/src/libcharon/sa/tasks/ike_mobike.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
@@ -19,7 +19,7 @@
 
 #include <hydra.h>
 #include <daemon.h>
-#include <sa/tasks/ike_natd.h>
+#include <sa/ikev2/tasks/ike_natd.h>
 #include <encoding/payloads/notify_payload.h>
 
 #define COOKIE2_SIZE 16
@@ -649,4 +649,3 @@ ike_mobike_t *ike_mobike_create(ike_sa_t *ike_sa, bool initiator)
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/tasks/ike_mobike.h b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
similarity index 98%
rename from src/libcharon/sa/tasks/ike_mobike.h
rename to src/libcharon/sa/ikev2/tasks/ike_mobike.h
index 16611939e3fe81dd4bb1ca746183f998bbfebc93..04cd33f5179542911081d84075b348f0cc43c6f8 100644 (file)
--- a/src/libcharon/sa/tasks/ike_mobike.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
@@ -25,7 +25,7 @@ typedef struct ike_mobike_t ike_mobike_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 #include <network/packet.h>
 
 /**

diff --git a/src/libcharon/sa/tasks/ike_natd.c b/src/libcharon/sa/ikev2/tasks/ike_natd.c
similarity index 100%
rename from src/libcharon/sa/tasks/ike_natd.c
rename to src/libcharon/sa/ikev2/tasks/ike_natd.c

diff --git a/src/libcharon/sa/tasks/ike_natd.h b/src/libcharon/sa/ikev2/tasks/ike_natd.h
similarity index 98%
rename from src/libcharon/sa/tasks/ike_natd.h
rename to src/libcharon/sa/ikev2/tasks/ike_natd.h
index 68114af42a36d1435cd3547d71be68875c89bbe0..33ebfcae7f0e1fb8b43702ba9b4998e26e31f4fe 100644 (file)
--- a/src/libcharon/sa/tasks/ike_natd.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_natd.h
@@ -25,7 +25,7 @@ typedef struct ike_natd_t ike_natd_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_natd, detects NAT situation in IKE_SA_INIT exchange.

diff --git a/src/libcharon/sa/tasks/ike_reauth.c b/src/libcharon/sa/ikev2/tasks/ike_reauth.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_reauth.c
rename to src/libcharon/sa/ikev2/tasks/ike_reauth.c
index 38c7a4272303397c910407731edd8cbacbed2df5..d9f3fe8de75d3b43708cb6f6cc00b33cf23f8e70 100644 (file)
--- a/src/libcharon/sa/tasks/ike_reauth.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_reauth.c
@@ -16,7 +16,7 @@
 #include "ike_reauth.h"
 
 #include <daemon.h>
-#include <sa/tasks/ike_delete.h>
+#include <sa/ikev2/tasks/ike_delete.h>
 
 
 typedef struct private_ike_reauth_t private_ike_reauth_t;
@@ -190,4 +190,3 @@ ike_reauth_t *ike_reauth_create(ike_sa_t *ike_sa)
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/tasks/ike_reauth.h b/src/libcharon/sa/ikev2/tasks/ike_reauth.h
similarity index 97%
rename from src/libcharon/sa/tasks/ike_reauth.h
rename to src/libcharon/sa/ikev2/tasks/ike_reauth.h
index 5e97b719c92d1da9ad95378e105542c0b05ef879..52c507ede34a02417e54eff472e5030da36a582f 100644 (file)
--- a/src/libcharon/sa/tasks/ike_reauth.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_reauth.h
@@ -25,7 +25,7 @@ typedef struct ike_reauth_t ike_reauth_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type ike_reauth, reestablishes an IKE_SA.

diff --git a/src/libcharon/sa/tasks/ike_rekey.c b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_rekey.c
rename to src/libcharon/sa/ikev2/tasks/ike_rekey.c
index a0d346040f3a259aa24563023e7f241f29ad148c..2cfcdc1fc8bcbc886a56761da902e98e7b1185b8 100644 (file)
--- a/src/libcharon/sa/tasks/ike_rekey.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
@@ -18,8 +18,8 @@
 
 #include <daemon.h>
 #include <encoding/payloads/notify_payload.h>
-#include <sa/tasks/ike_init.h>
-#include <sa/tasks/ike_delete.h>
+#include <sa/ikev2/tasks/ike_init.h>
+#include <sa/ikev2/tasks/ike_delete.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 #include <processing/jobs/rekey_ike_sa_job.h>
 

diff --git a/src/libcharon/sa/tasks/ike_rekey.h b/src/libcharon/sa/ikev2/tasks/ike_rekey.h
similarity index 98%
rename from src/libcharon/sa/tasks/ike_rekey.h
rename to src/libcharon/sa/ikev2/tasks/ike_rekey.h
index 6a9d59b0e4c209450799eff633b352153c94bf6d..20fcd80ed4197fc925f85eefafa88cb8b9e0bef4 100644 (file)
--- a/src/libcharon/sa/tasks/ike_rekey.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.h
@@ -25,7 +25,7 @@ typedef struct ike_rekey_t ike_rekey_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Task of type TASK_IKE_REKEY, rekey an established IKE_SA.

diff --git a/src/libcharon/sa/tasks/ike_vendor.c b/src/libcharon/sa/ikev2/tasks/ike_vendor.c
similarity index 99%
rename from src/libcharon/sa/tasks/ike_vendor.c
rename to src/libcharon/sa/ikev2/tasks/ike_vendor.c
index 7b3cc6e91360900c07dadd98b215812677d35774..b2b965a573be35aded69636dc69fb9b1fc9bbd12 100644 (file)
--- a/src/libcharon/sa/tasks/ike_vendor.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_vendor.c
@@ -139,4 +139,3 @@ ike_vendor_t *ike_vendor_create(ike_sa_t *ike_sa, bool initiator)
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/tasks/ike_vendor.h b/src/libcharon/sa/ikev2/tasks/ike_vendor.h
similarity index 97%
rename from src/libcharon/sa/tasks/ike_vendor.h
rename to src/libcharon/sa/ikev2/tasks/ike_vendor.h
index 6c353c447b012128fe07af9012839c800a9fa8da..54aad95412782494701ff058d355b6b358fe5ab2 100644 (file)
--- a/src/libcharon/sa/tasks/ike_vendor.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_vendor.h
@@ -25,7 +25,7 @@ typedef struct ike_vendor_t ike_vendor_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * Vendor ID processing task.

diff --git a/src/libcharon/sa/keymat.c b/src/libcharon/sa/keymat.c
index f132822b71fcd40d3722f53fa41b4c40c107e2ab..bcf131fd0b60e5a852bb678291c1843ea3e4d65d 100644 (file)
--- a/src/libcharon/sa/keymat.c
+++ b/src/libcharon/sa/keymat.c
@@ -14,8 +14,9 @@
  */
 
 #include "keymat.h"
-#include "keymat_v1.h"
-#include "keymat_v2.h"
+
+#include <sa/ikev1/keymat_v1.h>
+#include <sa/ikev2/keymat_v2.h>
 
 /**
  * See header

diff --git a/src/libcharon/sa/keymat.h b/src/libcharon/sa/keymat.h
index 5395c3776bc1d8bb5fd29408ebda9b7a78c84464..4a551a8f5a17dbe458c19c75a1bb4ee67fc57835 100644 (file)
--- a/src/libcharon/sa/keymat.h
+++ b/src/libcharon/sa/keymat.h
@@ -28,7 +28,7 @@ typedef struct keymat_t keymat_t;
 #include <crypto/prfs/prf.h>
 #include <crypto/aead.h>
 #include <config/proposal.h>
-#include <config/peer_cfg.h> /* for ike_version_t */
+#include <config/peer_cfg.h>
 #include <sa/ike_sa_id.h>
 
 /**

diff --git a/src/libcharon/sa/tasks/task.c b/src/libcharon/sa/task.c
similarity index 100%
rename from src/libcharon/sa/tasks/task.c
rename to src/libcharon/sa/task.c

diff --git a/src/libcharon/sa/tasks/task.h b/src/libcharon/sa/task.h
similarity index 100%
rename from src/libcharon/sa/tasks/task.h
rename to src/libcharon/sa/task.h

diff --git a/src/libcharon/sa/task_manager.c b/src/libcharon/sa/task_manager.c
index 3538087bc484d5f1b0b808db0c38143b7d86f3b2..70f732fab5deb468d5567e01be0e3f01454a185a 100644 (file)
--- a/src/libcharon/sa/task_manager.c
+++ b/src/libcharon/sa/task_manager.c
@@ -14,8 +14,9 @@
  */
 
 #include "task_manager.h"
-#include "task_manager_v1.h"
-#include "task_manager_v2.h"
+
+#include <sa/ikev1/task_manager_v1.h>
+#include <sa/ikev2/task_manager_v2.h>
 
 /**
  * See header

diff --git a/src/libcharon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
index 42a04fb649787326a426030ed40dea38e6a4952c..47b39a68aa57a8ac081c8706a7c99ea765eb79ea 100644 (file)
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -29,7 +29,7 @@ typedef enum task_queue_t task_queue_t;
 #include <library.h>
 #include <encoding/message.h>
 #include <sa/ike_sa.h>
-#include <sa/tasks/task.h>
+#include <sa/task.h>
 
 /**
  * First retransmit timeout in seconds.