From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 15 Jun 2015 09:52:16 +0000 (+0200)
Subject: ike-rekey: Reset IKE_SA on bus before sending CREATE_CHILD_SA response
X-Git-Tag: 5.3.3dr2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2efcc9586714fd3ae26fe6ff57ea1b9ee09a58ea;p=thirdparty%2Fstrongswan.git

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 1dfdc05072..4133c93b47 100644
--- 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 */