Renamed ike_cert_post_v1 to isakmp_cert_post

src/libcharon/Makefile.am

@@ -85,7 +85,6 @@ 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_cert_pre_v1.c sa/tasks/ike_cert_pre_v1.h \
-sa/tasks/ike_cert_post_v1.c sa/tasks/ike_cert_post_v1.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 \
@@ -100,6 +99,7 @@ sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
 sa/tasks/ike_vendor_v1.c sa/tasks/ike_vendor_v1.h \
 sa/tasks/main_mode.c sa/tasks/main_mode.h \
 sa/tasks/informational.c sa/tasks/informational.h \
+sa/tasks/isakmp_cert_post.c sa/tasks/isakmp_cert_post.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 \

src/libcharon/sa/ike_sa.c

@@ -37,7 +37,6 @@
 #include <sa/tasks/ike_cert_pre.h>
 #include <sa/tasks/ike_cert_pre_v1.h>
 #include <sa/tasks/ike_cert_post.h>
-#include <sa/tasks/ike_cert_post_v1.h>
 #include <sa/tasks/ike_rekey.h>
 #include <sa/tasks/ike_reauth.h>
 #include <sa/tasks/ike_delete.h>
@@ -47,6 +46,7 @@
 #include <sa/tasks/child_delete.h>
 #include <sa/tasks/child_rekey.h>
 #include <sa/tasks/main_mode.h>
+#include <sa/tasks/isakmp_cert_post.h>
 #include <sa/tasks/quick_mode.h>
 #include <sa/tasks/quick_delete.h>
 #include <sa/tasks/ike_natd_v1.h>
@@ -1125,7 +1125,7 @@ METHOD(ike_sa_t, initiate, status_t,
 			this->task_manager->queue_task(this->task_manager, task);
 			task = (task_t*)main_mode_create(&this->public, TRUE);
 			this->task_manager->queue_task(this->task_manager, task);
-			task = (task_t*)ike_cert_post_v1_create(&this->public, TRUE);
+			task = (task_t*)isakmp_cert_post_create(&this->public, TRUE);
 			this->task_manager->queue_task(this->task_manager, task);
 			task = (task_t*)ike_natd_v1_create(&this->public, TRUE);
 			this->task_manager->queue_task(this->task_manager, task);

src/libcharon/sa/task_manager_v1.c

@@ -27,7 +27,7 @@
 #include <sa/tasks/ike_natd_v1.h>
 #include <sa/tasks/ike_vendor_v1.h>
 #include <sa/tasks/ike_cert_pre_v1.h>
-#include <sa/tasks/ike_cert_post_v1.h>
+#include <sa/tasks/isakmp_cert_post.h>
 #include <processing/jobs/retransmit_job.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 
@@ -304,7 +304,7 @@ METHOD(task_manager_t, initiate, status_t,
 				if (activate_task(this, TASK_MAIN_MODE))
 				{
 					exchange = ID_PROT;
-					activate_task(this, TASK_IKE_CERT_POST_V1);
+					activate_task(this, TASK_ISAKMP_CERT_POST);
 					activate_task(this, TASK_IKE_NATD_V1);
 				}
 				break;
@@ -664,7 +664,7 @@ static status_t process_request(private_task_manager_t *this,
 				this->passive_tasks->insert_last(this->passive_tasks, task);
 				task = (task_t *)main_mode_create(this->ike_sa, FALSE);
 				this->passive_tasks->insert_last(this->passive_tasks, task);
-				task = (task_t*)ike_cert_post_v1_create(this->ike_sa, FALSE);
+				task = (task_t*)isakmp_cert_post_create(this->ike_sa, FALSE);
 				this->passive_tasks->insert_last(this->passive_tasks, task);
 				task = (task_t *)ike_natd_v1_create(this->ike_sa, FALSE);
 				this->passive_tasks->insert_last(this->passive_tasks, task);

src/libcharon/sa/tasks/isakmp_cert_post.c

@@ -13,7 +13,7 @@
  * for more details.
  */
 
-#include "ike_cert_post_v1.h"
+#include "isakmp_cert_post.h"
 
 #include <daemon.h>
 #include <sa/ike_sa.h>
@@ -24,17 +24,17 @@
 #include <credentials/certificates/x509.h>
 
 
-typedef struct private_ike_cert_post_v1_t private_ike_cert_post_v1_t;
+typedef struct private_isakmp_cert_post_t private_isakmp_cert_post_t;
 
 /**
- * Private members of a ike_cert_post_v1_t task.
+ * Private members of a isakmp_cert_post_t task.
  */
-struct private_ike_cert_post_v1_t {
+struct private_isakmp_cert_post_t {
 
 	/**
 	 * Public methods and task_t interface.
 	 */
-	ike_cert_post_v1_t public;
+	isakmp_cert_post_t public;
 
 	/**
 	 * Assigned IKE_SA.
@@ -59,7 +59,7 @@ struct private_ike_cert_post_v1_t {
 /**
  * Check if we actually use certificates for authentication
  */
-static bool use_certs(private_ike_cert_post_v1_t *this, message_t *message)
+static bool use_certs(private_isakmp_cert_post_t *this, message_t *message)
 {
 	enumerator_t *enumerator;
 	payload_t *payload;
@@ -95,7 +95,7 @@ static bool use_certs(private_ike_cert_post_v1_t *this, message_t *message)
 /**
  * Add certificates to message
  */
-static void build_certs(private_ike_cert_post_v1_t *this, message_t *message)
+static void build_certs(private_isakmp_cert_post_t *this, message_t *message)
 {
 	peer_cfg_t *peer_cfg;
 
@@ -158,7 +158,7 @@ static void build_certs(private_ike_cert_post_v1_t *this, message_t *message)
 }
 
 METHOD(task_t, build_i, status_t,
-	private_ike_cert_post_v1_t *this, message_t *message)
+	private_isakmp_cert_post_t *this, message_t *message)
 {
 	switch (message->get_exchange_type(message))
 	{
@@ -182,7 +182,7 @@ METHOD(task_t, build_i, status_t,
 }
 
 METHOD(task_t, process_r, status_t,
-	private_ike_cert_post_v1_t *this, message_t *message)
+	private_isakmp_cert_post_t *this, message_t *message)
 {
 	switch (message->get_exchange_type(message))
 	{
@@ -224,7 +224,7 @@ METHOD(task_t, process_r, status_t,
 }
 
 METHOD(task_t, build_r, status_t,
-	private_ike_cert_post_v1_t *this, message_t *message)
+	private_isakmp_cert_post_t *this, message_t *message)
 {
 	switch (message->get_exchange_type(message))
 	{
@@ -259,7 +259,7 @@ METHOD(task_t, build_r, status_t,
 }
 
 METHOD(task_t, process_i, status_t,
-	private_ike_cert_post_v1_t *this, message_t *message)
+	private_isakmp_cert_post_t *this, message_t *message)
 {
 	switch (message->get_exchange_type(message))
 	{
@@ -298,19 +298,19 @@ METHOD(task_t, process_i, status_t,
 }
 
 METHOD(task_t, get_type, task_type_t,
-	private_ike_cert_post_v1_t *this)
+	private_isakmp_cert_post_t *this)
 {
-	return TASK_IKE_CERT_POST_V1;
+	return TASK_ISAKMP_CERT_POST;
 }
 
 METHOD(task_t, migrate, void,
-	private_ike_cert_post_v1_t *this, ike_sa_t *ike_sa)
+	private_isakmp_cert_post_t *this, ike_sa_t *ike_sa)
 {
 	this->ike_sa = ike_sa;
 }
 
 METHOD(task_t, destroy, void,
-	private_ike_cert_post_v1_t *this)
+	private_isakmp_cert_post_t *this)
 {
 	free(this);
 }
@@ -318,9 +318,9 @@ METHOD(task_t, destroy, void,
 /*
  * Described in header.
  */
-ike_cert_post_v1_t *ike_cert_post_v1_create(ike_sa_t *ike_sa, bool initiator)
+isakmp_cert_post_t *isakmp_cert_post_create(ike_sa_t *ike_sa, bool initiator)
 {
-	private_ike_cert_post_v1_t *this;
+	private_isakmp_cert_post_t *this;
 
 	INIT(this,
 		.public = {

src/libcharon/sa/tasks/isakmp_cert_post.h

@@ -14,23 +14,23 @@
  */
 
 /**
- * @defgroup ike_cert_post_v1 ike_cert_post_v1
+ * @defgroup isakmp_cert_post isakmp_cert_post
  * @{ @ingroup tasks
  */
 
-#ifndef IKE_CERT_POST_V1_H_
+#ifndef ISAKMP_CERT_POST_H_
-#define IKE_CERT_POST_V1_H_
+#define ISAKMP_CERT_POST_H_
 
-typedef struct ike_cert_post_v1_t ike_cert_post_v1_t;
+typedef struct isakmp_cert_post_t isakmp_cert_post_t;
 
 #include <library.h>
 #include <sa/ike_sa.h>
 #include <sa/tasks/task.h>
 
 /**
- * IKE_CERT_POST_V1, IKEv1 certificate processing after authentication.
+ * ISAKMP_CERT_POST, IKEv1 certificate processing after authentication.
  */
-struct ike_cert_post_v1_t {
+struct isakmp_cert_post_t {
 
 	/**
 	 * Implements the task_t interface
@@ -39,15 +39,15 @@ struct ike_cert_post_v1_t {
 };
 
 /**
- * Create a new ike_cert_post_v1 task.
+ * Create a new isakmp_cert_post task.
  *
  * The initiator parameter means the original initiator, not the initiator
  * of the certificate request.
  *
  * @param ike_sa		IKE_SA this task works for
  * @param initiator		TRUE if task is the original initiator
- * @return				ike_cert_post_v1 task to handle by the task_manager
+ * @return				isakmp_cert_post task to handle by the task_manager
  */
-ike_cert_post_v1_t *ike_cert_post_v1_create(ike_sa_t *ike_sa, bool initiator);
+isakmp_cert_post_t *isakmp_cert_post_create(ike_sa_t *ike_sa, bool initiator);
 
-#endif /** IKE_CERT_POST_V1_H_ @}*/
+#endif /** ISAKMP_CERT_POST_H_ @}*/

src/libcharon/sa/tasks/task.c

@@ -16,7 +16,7 @@
 
 #include "task.h"
 
-ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
+ENUM(task_type_names, TASK_IKE_INIT, TASK_ISAKMP_CERT_POST,
 	"IKE_INIT",
 	"IKE_NATD",
 	"IKE_MOBIKE",
@@ -46,5 +46,5 @@ ENUM(task_type_names, TASK_IKE_INIT, TASK_IKE_CERT_POST_V1,
 	"VENDOR_V1",
 	"IKE_NATD_V1",
 	"IKE_CERT_PRE_V1",
-	"IKE_CERT_POST_V1",
+	"ISAKMP_CERT_POST",
 );

src/libcharon/sa/tasks/task.h

@@ -90,7 +90,7 @@ enum task_type_t {
 	/** IKEv1 pre-authentication certificate handling */
 	TASK_IKE_CERT_PRE_V1,
 	/** IKEv1 post-authentication certificate handling */
-	TASK_IKE_CERT_POST_V1,
+	TASK_ISAKMP_CERT_POST,
 };
 
 /**