diff options
| author | Martin Willi <martin@revosec.ch> | 2011-12-06 12:14:48 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:13 +0100 |
| commit | 0bcdb8e571d67d363a54ff2c2e3ecaf52bb93ebc (patch) | |
| tree | 09fbb0fc12d721976d27b1df7512e67913695f36 /src/libcharon/sa/task_manager_v1.c | |
| parent | 8c33850615f0c69ea3229f3c297bb642c6c990f0 (diff) | |
| download | strongswan-0bcdb8e571d67d363a54ff2c2e3ecaf52bb93ebc.tar.bz2 strongswan-0bcdb8e571d67d363a54ff2c2e3ecaf52bb93ebc.tar.xz | |
Implemented pre-authentication certificate handling for IKEv1
Diffstat (limited to 'src/libcharon/sa/task_manager_v1.c')
| -rwxr-xr-x | src/libcharon/sa/task_manager_v1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libcharon/sa/task_manager_v1.c b/src/libcharon/sa/task_manager_v1.c index c08f70be8..0843db51e 100755 --- a/src/libcharon/sa/task_manager_v1.c +++ b/src/libcharon/sa/task_manager_v1.c @@ -24,7 +24,7 @@ #include <sa/tasks/xauth_request.h> #include <sa/tasks/ike_natd_v1.h> #include <sa/tasks/ike_vendor_v1.h> -#include <sa/tasks/ike_cert_pre.h> +#include <sa/tasks/ike_cert_pre_v1.h> #include <sa/tasks/ike_cert_post.h> #include <processing/jobs/retransmit_job.h> #include <processing/jobs/delete_ike_sa_job.h> @@ -266,6 +266,7 @@ METHOD(task_manager_t, initiate, status_t, { case IKE_CREATED: activate_task(this, TASK_VENDOR_V1); + activate_task(this, TASK_IKE_CERT_PRE_V1); if (activate_task(this, TASK_MAIN_MODE)) { exchange = ID_PROT; @@ -501,14 +502,12 @@ static status_t process_request(private_task_manager_t *this, case ID_PROT: task = (task_t *)ike_vendor_v1_create(this->ike_sa, FALSE); this->passive_tasks->insert_last(this->passive_tasks, task); - task = (task_t*)ike_cert_pre_create(this->ike_sa, FALSE); + task = (task_t*)ike_cert_pre_v1_create(this->ike_sa, FALSE); 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_natd_v1_create(this->ike_sa, FALSE); this->passive_tasks->insert_last(this->passive_tasks, task); - task = (task_t*)ike_cert_post_create(this->ike_sa, FALSE); - this->passive_tasks->insert_last(this->passive_tasks, task); break; case AGGRESSIVE: /* TODO-IKEv1: agressive mode */ |