ike-rekey: Reset IKE_SA on bus before sending CREATE_CHILD_SA response

Even when there is no error the CREATE_CHILD_SA response should be sent
in the context of the existing IKE_SA.

diff --git a/src/libcharon/sa/ikev2/tasks/ike_rekey.c b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
index 1dfdc05072a5a4aef5447ec6c24853982fb73687..4133c93b47252404da347cc52ae136974c98f5aa 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/ike_rekey.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
@@ -228,9 +228,10 @@ METHOD(task_t, build_r, status_t,
 
        if (this->ike_init->task.build(&this->ike_init->task, message) == FAILED)
        {
+               charon->bus->set_sa(charon->bus, this->ike_sa);
                return SUCCESS;
        }
-
+       charon->bus->set_sa(charon->bus, this->ike_sa);
        this->ike_sa->set_state(this->ike_sa, IKE_REKEYING);
 
        /* rekeying successful, delete the IKE_SA using a subtask */