aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2016-05-31 10:08:03 +0200
committerTobias Brunner <tobias@strongswan.org>2016-06-17 18:48:06 +0200
commit144bebe4b2df3829cc8e02de546b1e5ef888dcee (patch)
tree6d0d0cbb927a3701b4bd3d1a1c57d561f9545d50
parent7b3eccfff4c8de7e23fd6bb6425253c828e0a7c1 (diff)
downloadstrongswan-144bebe4b2df3829cc8e02de546b1e5ef888dcee.tar.bz2
strongswan-144bebe4b2df3829cc8e02de546b1e5ef888dcee.tar.xz
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).
-rw-r--r--src/libcharon/sa/ikev2/tasks/child_delete.c6
1 files changed, 1 insertions, 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);
}