]> git.ipfire.org Git - thirdparty/strongswan.git/blobdiff - src/libcharon/sa/ikev1/tasks/main_mode.c
ike: Optionally allow private algorithms for IKE/CHILD_SAs
[thirdparty/strongswan.git] / src / libcharon / sa / ikev1 / tasks / main_mode.c
index ba1a9ad1dd399d2f3be04e4c7b98be925962bb73..24b2f24d17e5da200018e5fa7564b6f02f2a1276 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2011 Tobias Brunner
- * Hochschule fuer Technik Rapperswil
+ * Copyright (C) 2011-2012 Tobias Brunner
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * Copyright (C) 2011 Martin Willi
  * Copyright (C) 2011 revosec AG
@@ -30,6 +30,7 @@
 #include <sa/ikev1/tasks/informational.h>
 #include <sa/ikev1/tasks/isakmp_delete.h>
 #include <processing/jobs/adopt_children_job.h>
+#include <processing/jobs/delete_ike_sa_job.h>
 
 typedef struct private_main_mode_t private_main_mode_t;
 
@@ -76,7 +77,7 @@ struct private_main_mode_t {
        /**
         * Negotiated SA lifetime
         */
-       u_int32_t lifetime;
+       uint32_t lifetime;
 
        /**
         * Negotiated authentication method
@@ -95,8 +96,14 @@ struct private_main_mode_t {
 /**
  * Set IKE_SA to established state
  */
-static void establish(private_main_mode_t *this)
+static bool establish(private_main_mode_t *this)
 {
+       if (!charon->bus->authorize(charon->bus, TRUE))
+       {
+               DBG1(DBG_IKE, "final authorization hook forbids IKE_SA, cancelling");
+               return FALSE;
+       }
+
        DBG0(DBG_IKE, "IKE_SA %s[%d] established between %H[%Y]...%H[%Y]",
                 this->ike_sa->get_name(this->ike_sa),
                 this->ike_sa->get_unique_id(this->ike_sa),
@@ -107,6 +114,8 @@ static void establish(private_main_mode_t *this)
 
        this->ike_sa->set_state(this->ike_sa, IKE_ESTABLISHED);
        charon->bus->ike_updown(charon->bus, this->ike_sa, TRUE);
+
+       return TRUE;
 }
 
 /**
@@ -121,7 +130,7 @@ static bool has_notify_errors(private_main_mode_t *this, message_t *message)
        enumerator = message->create_payload_enumerator(message);
        while (enumerator->enumerate(enumerator, &payload))
        {
-               if (payload->get_type(payload) == NOTIFY_V1)
+               if (payload->get_type(payload) == PLV1_NOTIFY)
                {
                        notify_payload_t *notify;
                        notify_type_t type;
@@ -164,10 +173,10 @@ static status_t send_notify(private_main_mode_t *this, notify_type_t type)
 {
        notify_payload_t *notify;
        ike_sa_id_t *ike_sa_id;
-       u_int64_t spi_i, spi_r;
+       uint64_t spi_i, spi_r;
        chunk_t spi;
 
-       notify = notify_payload_create_from_protocol_and_type(NOTIFY_V1,
+       notify = notify_payload_create_from_protocol_and_type(PLV1_NOTIFY,
                                                                                                                  PROTO_IKE, type);
        ike_sa_id = this->ike_sa->get_id(this->ike_sa);
        spi_i = ike_sa_id->get_initiator_spi(ike_sa_id);
@@ -178,6 +187,8 @@ static status_t send_notify(private_main_mode_t *this, notify_type_t type)
        this->ike_sa->queue_task(this->ike_sa,
                                                (task_t*)informational_create(this->ike_sa, notify));
        /* cancel all active/passive tasks in favour of informational */
+       this->ike_sa->flush_queue(this->ike_sa,
+                                       this->initiator ? TASK_QUEUE_ACTIVE : TASK_QUEUE_PASSIVE);
        return ALREADY_DONE;
 }
 
@@ -189,9 +200,47 @@ static status_t send_delete(private_main_mode_t *this)
        this->ike_sa->queue_task(this->ike_sa,
                                                (task_t*)isakmp_delete_create(this->ike_sa, TRUE));
        /* cancel all active tasks in favour of informational */
+       this->ike_sa->flush_queue(this->ike_sa,
+                                       this->initiator ? TASK_QUEUE_ACTIVE : TASK_QUEUE_PASSIVE);
        return ALREADY_DONE;
 }
 
+/**
+ * Add an INITIAL_CONTACT notify if first contact with peer
+ */
+static void add_initial_contact(private_main_mode_t *this, message_t *message,
+                                                               identification_t *idi)
+{
+       identification_t *idr;
+       host_t *host;
+       notify_payload_t *notify;
+       ike_sa_id_t *ike_sa_id;
+       uint64_t spi_i, spi_r;
+       chunk_t spi;
+
+       idr = this->ph1->get_id(this->ph1, this->peer_cfg, FALSE);
+       if (idr && !idr->contains_wildcards(idr))
+       {
+               if (this->peer_cfg->get_unique_policy(this->peer_cfg) != UNIQUE_NEVER)
+               {
+                       host = this->ike_sa->get_other_host(this->ike_sa);
+                       if (!charon->ike_sa_manager->has_contact(charon->ike_sa_manager,
+                                                                               idi, idr, host->get_family(host)))
+                       {
+                               notify = notify_payload_create_from_protocol_and_type(
+                                                               PLV1_NOTIFY, PROTO_IKE, INITIAL_CONTACT_IKEV1);
+                               ike_sa_id = this->ike_sa->get_id(this->ike_sa);
+                               spi_i = ike_sa_id->get_initiator_spi(ike_sa_id);
+                               spi_r = ike_sa_id->get_responder_spi(ike_sa_id);
+                               spi = chunk_cata("cc", chunk_from_thing(spi_i),
+                                                                chunk_from_thing(spi_r));
+                               notify->set_spi_data(notify, spi);
+                               message->add_payload(message, (payload_t*)notify);
+                       }
+               }
+       }
+}
+
 METHOD(task_t, build_i, status_t,
        private_main_mode_t *this, message_t *message)
 {
@@ -229,7 +278,8 @@ METHOD(task_t, build_i, status_t,
                        this->lifetime += this->peer_cfg->get_over_time(this->peer_cfg);
                        proposals = this->ike_cfg->get_proposals(this->ike_cfg);
                        sa_payload = sa_payload_create_from_proposals_v1(proposals,
-                                                       this->lifetime, 0, this->method, MODE_NONE, FALSE);
+                                                                       this->lifetime, 0, this->method, MODE_NONE,
+                                                                       ENCAP_NONE, 0);
                        proposals->destroy_offset(proposals, offsetof(proposal_t, destroy));
 
                        message->add_payload(message, &sa_payload->payload_interface);
@@ -252,9 +302,9 @@ METHOD(task_t, build_i, status_t,
                }
                case MM_SA:
                {
-                       u_int16_t group;
+                       uint16_t group;
 
-                       if (!this->ph1->create_hasher(this->ph1, this->proposal))
+                       if (!this->ph1->create_hasher(this->ph1))
                        {
                                return send_notify(this, NO_PROPOSAL_CHOSEN);
                        }
@@ -282,21 +332,19 @@ METHOD(task_t, build_i, status_t,
                        identification_t *id;
 
                        id = this->ph1->get_id(this->ph1, this->peer_cfg, TRUE);
-                       if (!id)
-                       {
-                               DBG1(DBG_CFG, "own identity not known");
-                               return send_notify(this, INVALID_ID_INFORMATION);
-                       }
                        this->ike_sa->set_my_id(this->ike_sa, id->clone(id));
-                       id_payload = id_payload_create_from_identification(ID_V1, id);
+                       id_payload = id_payload_create_from_identification(PLV1_ID, id);
                        message->add_payload(message, &id_payload->payload_interface);
 
                        if (!this->ph1->build_auth(this->ph1, this->method, message,
                                                                           id_payload->get_encoded(id_payload)))
                        {
+                               charon->bus->alert(charon->bus, ALERT_LOCAL_AUTH_FAILED);
                                return send_notify(this, AUTHENTICATION_FAILED);
                        }
 
+                       add_initial_contact(this, message, id);
+
                        this->state = MM_AUTH;
                        return NEED_MORE;
                }
@@ -314,6 +362,7 @@ METHOD(task_t, process_r, status_t,
                {
                        linked_list_t *list;
                        sa_payload_t *sa_payload;
+                       proposal_selection_flag_t flags = 0;
 
                        this->ike_cfg = this->ike_sa->get_ike_cfg(this->ike_sa);
                        DBG0(DBG_IKE, "%H is initiating a Main Mode IKE_SA",
@@ -325,7 +374,7 @@ METHOD(task_t, process_r, status_t,
                                                                           message->get_source(message), TRUE);
 
                        sa_payload = (sa_payload_t*)message->get_payload(message,
-                                                                                                       SECURITY_ASSOCIATION_V1);
+                                                                                                       PLV1_SECURITY_ASSOCIATION);
                        if (!sa_payload)
                        {
                                DBG1(DBG_IKE, "SA payload missing");
@@ -337,26 +386,39 @@ METHOD(task_t, process_r, status_t,
                        }
 
                        list = sa_payload->get_proposals(sa_payload);
+                       if (!this->ike_sa->supports_extension(this->ike_sa, EXT_STRONGSWAN)
+                               && !lib->settings->get_bool(lib->settings,
+                                                                       "%s.accept_private_algs", FALSE, lib->ns))
+                       {
+                               flags |= PROPOSAL_SKIP_PRIVATE;
+                       }
+                       if (!lib->settings->get_bool(lib->settings,
+                                                       "%s.prefer_configured_proposals", TRUE, lib->ns))
+                       {
+                               flags |= PROPOSAL_PREFER_SUPPLIED;
+                       }
                        this->proposal = this->ike_cfg->select_proposal(this->ike_cfg,
-                                                                                                                       list, FALSE);
+                                                                                       list, flags);
                        list->destroy_offset(list, offsetof(proposal_t, destroy));
                        if (!this->proposal)
                        {
                                DBG1(DBG_IKE, "no proposal found");
                                return send_notify(this, NO_PROPOSAL_CHOSEN);
                        }
+                       this->ike_sa->set_proposal(this->ike_sa, this->proposal);
 
                        this->method = sa_payload->get_auth_method(sa_payload);
-                       this->lifetime = sa_payload->get_lifetime(sa_payload);
+                       this->lifetime = sa_payload->get_lifetime(sa_payload,
+                                                                                                         this->proposal);
 
                        this->state = MM_SA;
                        return NEED_MORE;
                }
                case MM_SA:
                {
-                       u_int16_t group;
+                       uint16_t group;
 
-                       if (!this->ph1->create_hasher(this->ph1, this->proposal))
+                       if (!this->ph1->create_hasher(this->ph1))
                        {
                                return send_notify(this, INVALID_KEY_INFORMATION);
                        }
@@ -383,29 +445,43 @@ METHOD(task_t, process_r, status_t,
                        id_payload_t *id_payload;
                        identification_t *id;
 
-                       id_payload = (id_payload_t*)message->get_payload(message, ID_V1);
+                       id_payload = (id_payload_t*)message->get_payload(message, PLV1_ID);
                        if (!id_payload)
                        {
                                DBG1(DBG_IKE, "IDii payload missing");
+                               charon->bus->alert(charon->bus, ALERT_PEER_AUTH_FAILED);
                                return send_notify(this, INVALID_PAYLOAD_TYPE);
                        }
-
                        id = id_payload->get_identification(id_payload);
                        this->ike_sa->set_other_id(this->ike_sa, id);
-                       this->peer_cfg = this->ph1->select_config(this->ph1,
-                                                                                                         this->method, FALSE, id);
-                       if (!this->peer_cfg)
+
+                       while (TRUE)
                        {
-                               DBG1(DBG_IKE, "no peer config found");
-                               return send_notify(this, AUTHENTICATION_FAILED);
+                               DESTROY_IF(this->peer_cfg);
+                               this->peer_cfg = this->ph1->select_config(this->ph1,
+                                                                                                       this->method, FALSE, id);
+                               if (!this->peer_cfg)
+                               {
+                                       charon->bus->alert(charon->bus, ALERT_PEER_AUTH_FAILED);
+                                       return send_notify(this, AUTHENTICATION_FAILED);
+                               }
+                               this->ike_sa->set_peer_cfg(this->ike_sa, this->peer_cfg);
+
+                               if (this->ph1->verify_auth(this->ph1, this->method, message,
+                                                                                  id_payload->get_encoded(id_payload)))
+                               {
+                                       break;
+                               }
                        }
-                       this->ike_sa->set_peer_cfg(this->ike_sa, this->peer_cfg);
 
-                       if (!this->ph1->verify_auth(this->ph1, this->method, message,
-                                                                               id_payload->get_encoded(id_payload)))
+                       if (!charon->bus->authorize(charon->bus, FALSE))
                        {
+                               DBG1(DBG_IKE, "Main Mode authorization hook forbids IKE_SA, "
+                                        "cancelling");
+                               charon->bus->alert(charon->bus, ALERT_PEER_AUTH_FAILED);
                                return send_notify(this, AUTHENTICATION_FAILED);
                        }
+
                        this->state = MM_AUTH;
                        if (has_notify_errors(this, message))
                        {
@@ -428,7 +504,8 @@ METHOD(task_t, build_r, status_t,
                        sa_payload_t *sa_payload;
 
                        sa_payload = sa_payload_create_from_proposal_v1(this->proposal,
-                                                       this->lifetime, 0, this->method, MODE_NONE, FALSE);
+                                                                       this->lifetime, 0, this->method, MODE_NONE,
+                                                                       ENCAP_NONE, 0);
                        message->add_payload(message, &sa_payload->payload_interface);
 
                        return NEED_MORE;
@@ -439,8 +516,7 @@ METHOD(task_t, build_r, status_t,
                        {
                                return send_notify(this, INVALID_KEY_INFORMATION);
                        }
-                       if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method,
-                                                                               this->proposal))
+                       if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method))
                        {
                                return send_notify(this, INVALID_KEY_INFORMATION);
                        }
@@ -450,49 +526,102 @@ METHOD(task_t, build_r, status_t,
                {
                        id_payload_t *id_payload;
                        identification_t *id;
+                       adopt_children_job_t *job = NULL;
+                       xauth_t *xauth = NULL;
 
                        id = this->ph1->get_id(this->ph1, this->peer_cfg, TRUE);
-                       if (!id)
-                       {
-                               DBG1(DBG_CFG, "own identity not known");
-                               return send_notify(this, INVALID_ID_INFORMATION);
-                       }
                        this->ike_sa->set_my_id(this->ike_sa, id->clone(id));
 
-                       id_payload = id_payload_create_from_identification(ID_V1, id);
+                       id_payload = id_payload_create_from_identification(PLV1_ID, id);
                        message->add_payload(message, &id_payload->payload_interface);
 
                        if (!this->ph1->build_auth(this->ph1, this->method, message,
                                                                           id_payload->get_encoded(id_payload)))
                        {
+                               charon->bus->alert(charon->bus, ALERT_LOCAL_AUTH_FAILED);
                                return send_notify(this, AUTHENTICATION_FAILED);
                        }
+
                        switch (this->method)
                        {
                                case AUTH_XAUTH_INIT_PSK:
                                case AUTH_XAUTH_INIT_RSA:
                                case AUTH_HYBRID_INIT_RSA:
-                                       this->ike_sa->queue_task(this->ike_sa,
-                                                                       (task_t*)xauth_create(this->ike_sa, TRUE));
-                                       return SUCCESS;
+                                       xauth = xauth_create(this->ike_sa, TRUE);
+                                       this->ike_sa->queue_task(this->ike_sa, (task_t*)xauth);
+                                       break;
                                case AUTH_XAUTH_RESP_PSK:
                                case AUTH_XAUTH_RESP_RSA:
                                case AUTH_HYBRID_RESP_RSA:
-                                       /* TODO-IKEv1: not yet supported */
-                                       return FAILED;
+                                       /* wait for XAUTH request */
+                                       break;
                                default:
-                                       establish(this);
-                                       lib->processor->queue_job(lib->processor, (job_t*)
-                                                                       adopt_children_job_create(
-                                                                               this->ike_sa->get_id(this->ike_sa)));
-                                       return SUCCESS;
+                                       if (charon->ike_sa_manager->check_uniqueness(
+                                                               charon->ike_sa_manager, this->ike_sa, FALSE))
+                                       {
+                                               DBG1(DBG_IKE, "cancelling Main Mode due to uniqueness "
+                                                        "policy");
+                                               return send_notify(this, AUTHENTICATION_FAILED);
+                                       }
+                                       if (!establish(this))
+                                       {
+                                               charon->bus->alert(charon->bus, ALERT_PEER_AUTH_FAILED);
+                                               return send_notify(this, AUTHENTICATION_FAILED);
+                                       }
+                                       job = adopt_children_job_create(
+                                                                                       this->ike_sa->get_id(this->ike_sa));
+                                       break;
+                       }
+                       if (this->ph1->has_virtual_ip(this->ph1, this->peer_cfg))
+                       {
+                               if (this->peer_cfg->use_pull_mode(this->peer_cfg))
+                               {
+                                       this->ike_sa->queue_task(this->ike_sa,
+                                               (task_t*)mode_config_create(this->ike_sa, TRUE, TRUE));
+                               }
                        }
+                       else if (this->ph1->has_pool(this->ph1, this->peer_cfg))
+                       {
+                               if (!this->peer_cfg->use_pull_mode(this->peer_cfg))
+                               {
+                                       if (job)
+                                       {
+                                               job->queue_task(job, (task_t*)
+                                                               mode_config_create(this->ike_sa, TRUE, FALSE));
+                                       }
+                                       else if (xauth)
+                                       {
+                                               xauth->queue_mode_config_push(xauth);
+                                       }
+                                       else
+                                       {
+                                               this->ike_sa->queue_task(this->ike_sa, (task_t*)
+                                                               mode_config_create(this->ike_sa, TRUE, FALSE));
+                                       }
+                               }
+                       }
+                       if (job)
+                       {
+                               lib->processor->queue_job(lib->processor, (job_t*)job);
+                       }
+                       return SUCCESS;
                }
                default:
                        return FAILED;
        }
 }
 
+/**
+ * Schedule a timeout for the IKE_SA should it not establish
+ */
+static void schedule_timeout(ike_sa_t *ike_sa)
+{
+       job_t *job;
+
+       job = (job_t*)delete_ike_sa_job_create(ike_sa->get_id(ike_sa), FALSE);
+       lib->scheduler->schedule_job(lib->scheduler, job, HALF_OPEN_IKE_SA_TIMEOUT);
+}
+
 METHOD(task_t, process_i, status_t,
        private_main_mode_t *this, message_t *message)
 {
@@ -503,26 +632,34 @@ METHOD(task_t, process_i, status_t,
                        linked_list_t *list;
                        sa_payload_t *sa_payload;
                        auth_method_t method;
-                       u_int32_t lifetime;
+                       proposal_selection_flag_t flags = 0;
+                       uint32_t lifetime;
 
                        sa_payload = (sa_payload_t*)message->get_payload(message,
-                                                                                                       SECURITY_ASSOCIATION_V1);
+                                                                                                       PLV1_SECURITY_ASSOCIATION);
                        if (!sa_payload)
                        {
                                DBG1(DBG_IKE, "SA payload missing");
                                return send_notify(this, INVALID_PAYLOAD_TYPE);
                        }
                        list = sa_payload->get_proposals(sa_payload);
+                       if (!this->ike_sa->supports_extension(this->ike_sa, EXT_STRONGSWAN)
+                               && !lib->settings->get_bool(lib->settings,
+                                                                       "%s.accept_private_algs", FALSE, lib->ns))
+                       {
+                               flags |= PROPOSAL_SKIP_PRIVATE;
+                       }
                        this->proposal = this->ike_cfg->select_proposal(this->ike_cfg,
-                                                                                                                       list, FALSE);
+                                                                                                                       list, flags);
                        list->destroy_offset(list, offsetof(proposal_t, destroy));
                        if (!this->proposal)
                        {
                                DBG1(DBG_IKE, "no proposal found");
                                return send_notify(this, NO_PROPOSAL_CHOSEN);
                        }
+                       this->ike_sa->set_proposal(this->ike_sa, this->proposal);
 
-                       lifetime = sa_payload->get_lifetime(sa_payload);
+                       lifetime = sa_payload->get_lifetime(sa_payload, this->proposal);
                        if (lifetime != this->lifetime)
                        {
                                DBG1(DBG_IKE, "received lifetime %us does not match configured "
@@ -544,8 +681,7 @@ METHOD(task_t, process_i, status_t,
                        {
                                return send_notify(this, INVALID_PAYLOAD_TYPE);
                        }
-                       if (!this->ph1->derive_keys(this->ph1, this->peer_cfg,
-                                                                               this->method, this->proposal))
+                       if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method))
                        {
                                return send_notify(this, INVALID_KEY_INFORMATION);
                        }
@@ -556,10 +692,11 @@ METHOD(task_t, process_i, status_t,
                        id_payload_t *id_payload;
                        identification_t *id, *cid;
 
-                       id_payload = (id_payload_t*)message->get_payload(message, ID_V1);
+                       id_payload = (id_payload_t*)message->get_payload(message, PLV1_ID);
                        if (!id_payload)
                        {
                                DBG1(DBG_IKE, "IDir payload missing");
+                               charon->bus->alert(charon->bus, ALERT_PEER_AUTH_FAILED);
                                return send_delete(this);
                        }
                        id = id_payload->get_identification(id_payload);
@@ -568,6 +705,7 @@ METHOD(task_t, process_i, status_t,
                        {
                                DBG1(DBG_IKE, "IDir '%Y' does not match to '%Y'", id, cid);
                                id->destroy(id);
+                               charon->bus->alert(charon->bus, ALERT_PEER_AUTH_FAILED);
                                return send_delete(this);
                        }
                        this->ike_sa->set_other_id(this->ike_sa, id);
@@ -575,13 +713,15 @@ METHOD(task_t, process_i, status_t,
                        if (!this->ph1->verify_auth(this->ph1, this->method, message,
                                                                                id_payload->get_encoded(id_payload)))
                        {
+                               charon->bus->alert(charon->bus, ALERT_PEER_AUTH_FAILED);
                                return send_delete(this);
                        }
-
-                       if (this->peer_cfg->get_virtual_ip(this->peer_cfg))
+                       if (!charon->bus->authorize(charon->bus, FALSE))
                        {
-                               this->ike_sa->queue_task(this->ike_sa,
-                                                       (task_t*)mode_config_create(this->ike_sa, TRUE));
+                               DBG1(DBG_IKE, "Main Mode authorization hook forbids IKE_SA, "
+                                        "cancelling");
+                               charon->bus->alert(charon->bus, ALERT_PEER_AUTH_FAILED);
+                               return send_delete(this);
                        }
 
                        switch (this->method)
@@ -590,16 +730,55 @@ METHOD(task_t, process_i, status_t,
                                case AUTH_XAUTH_INIT_RSA:
                                case AUTH_HYBRID_INIT_RSA:
                                        /* wait for XAUTH request */
-                                       return SUCCESS;
+                                       schedule_timeout(this->ike_sa);
+                                       break;
                                case AUTH_XAUTH_RESP_PSK:
                                case AUTH_XAUTH_RESP_RSA:
                                case AUTH_HYBRID_RESP_RSA:
-                                       /* TODO-IKEv1: not yet */
-                                       return FAILED;
+                                       this->ike_sa->queue_task(this->ike_sa,
+                                                                       (task_t*)xauth_create(this->ike_sa, TRUE));
+                                       break;
                                default:
-                                       establish(this);
-                                       return SUCCESS;
+                                       if (charon->ike_sa_manager->check_uniqueness(
+                                                               charon->ike_sa_manager, this->ike_sa, FALSE))
+                                       {
+                                               DBG1(DBG_IKE, "cancelling Main Mode due to uniqueness "
+                                                        "policy");
+                                               return send_delete(this);
+                                       }
+                                       if (!establish(this))
+                                       {
+                                               charon->bus->alert(charon->bus, ALERT_PEER_AUTH_FAILED);
+                                               return send_delete(this);
+                                       }
+                                       break;
+                       }
+                       /* check for and prepare mode config push/pull */
+                       if (this->ph1->has_virtual_ip(this->ph1, this->peer_cfg))
+                       {
+                               if (this->peer_cfg->use_pull_mode(this->peer_cfg))
+                               {
+                                       this->ike_sa->queue_task(this->ike_sa,
+                                               (task_t*)mode_config_create(this->ike_sa, TRUE, TRUE));
+                               }
+                               else
+                               {
+                                       schedule_timeout(this->ike_sa);
+                               }
+                       }
+                       else if (this->ph1->has_pool(this->ph1, this->peer_cfg))
+                       {
+                               if (this->peer_cfg->use_pull_mode(this->peer_cfg))
+                               {
+                                       schedule_timeout(this->ike_sa);
+                               }
+                               else
+                               {
+                                       this->ike_sa->queue_task(this->ike_sa,
+                                               (task_t*)mode_config_create(this->ike_sa, TRUE, FALSE));
+                               }
                        }
+                       return SUCCESS;
                }
                default:
                        return FAILED;