From 144bebe4b2df3829cc8e02de546b1e5ef888dcee Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 31 May 2016 10:08:03 +0200 Subject: child-delete: Reply as usual when concurrently rekeying the IKE_SA As per RFC 7296, 2.25.2 (what we did before was the behavior described in RFC 4718). --- src/libcharon/sa/ikev2/tasks/child_delete.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libcharon/sa/ikev2/tasks/child_delete.c b/src/libcharon/sa/ikev2/tasks/child_delete.c index b79ccf374..6fa8836ac 100644 --- a/src/libcharon/sa/ikev2/tasks/child_delete.c +++ b/src/libcharon/sa/ikev2/tasks/child_delete.c @@ -382,11 +382,7 @@ METHOD(task_t, process_r, status_t, METHOD(task_t, build_r, status_t, private_child_delete_t *this, message_t *message) { - /* if we are rekeying, we send an empty informational */ - if (this->ike_sa->get_state(this->ike_sa) != IKE_REKEYING) - { - build_payloads(this, message); - } + build_payloads(this, message); DBG1(DBG_IKE, "CHILD_SA closed"); return destroy_and_reestablish(this); } -- cgit v1.2.3