From 59ebdac49bec9374080b2f1a0027ea6a26dece2f Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 5 Jun 2020 16:41:23 +0200 Subject: [PATCH] child-create: Don't reset DH group when retrying after INVALID_KE_PAYLOAD migrate() is called before retrying. Fixes: 0184a69b7b14 ("child-create: Properly handle DH group during migration when reestablishing") --- src/libcharon/sa/ikev2/tasks/child_create.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c index 278d09a60..2b9e68d3b 100644 --- a/src/libcharon/sa/ikev2/tasks/child_create.c +++ b/src/libcharon/sa/ikev2/tasks/child_create.c @@ -1853,7 +1853,7 @@ METHOD(task_t, migrate, void, { this->proposals->destroy_offset(this->proposals, offsetof(proposal_t, destroy)); } - if (!this->rekey) + if (!this->rekey && !this->retry) { this->dh_group = MODP_NONE; }