aboutsummaryrefslogtreecommitdiffstats
path: root/main/strongswan/0014-ike-rekey-Reset-IKE_SA-on-bus-before-sending-CREATE_.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/strongswan/0014-ike-rekey-Reset-IKE_SA-on-bus-before-sending-CREATE_.patch')
-rw-r--r--main/strongswan/0014-ike-rekey-Reset-IKE_SA-on-bus-before-sending-CREATE_.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/main/strongswan/0014-ike-rekey-Reset-IKE_SA-on-bus-before-sending-CREATE_.patch b/main/strongswan/0014-ike-rekey-Reset-IKE_SA-on-bus-before-sending-CREATE_.patch
deleted file mode 100644
index 9aa06d9256..0000000000
--- a/main/strongswan/0014-ike-rekey-Reset-IKE_SA-on-bus-before-sending-CREATE_.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2efcc9586714fd3ae26fe6ff57ea1b9ee09a58ea Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Mon, 15 Jun 2015 11:52:16 +0200
-Subject: [PATCH] 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.
----
- src/libcharon/sa/ikev2/tasks/ike_rekey.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libcharon/sa/ikev2/tasks/ike_rekey.c b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
-index 1dfdc05..4133c93 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 */
---
-2.4.6
-