Separated libcharon/sa directory with ikev1 and ikev2 subfolders

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>
 
 

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
 

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>

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.

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;

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.

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;

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.

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;
 

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;
 

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>
 

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;

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>
 
 /**

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.

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.

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.

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>

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.

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.

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;
 

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.

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.

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>
 
 /**

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;
 

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.

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.

src/libcharon/sa/ikev2/authenticators/eap/eap_manager.c

@@ -159,4 +159,3 @@ eap_manager_t *eap_manager_create()
 
 	return &this->public;
 }
-

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;
 

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;
 }
-

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.

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;
 }
-

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.

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;
 

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.

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;

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>

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>
 
 /**

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>
 
 /**

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>
 

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.

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;
 }
-

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.

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;
 }
-

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.

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;
 }
-

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.

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.

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;
 }
-

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

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.

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.

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>

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.

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.

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;
 }
-

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>
 
 /**

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.

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;
 }
-

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.

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>
 

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.

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;
 }
-

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.

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

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>
 
 /**

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

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.