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")

diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c
index 278d09a6068fea8c29858a09bc1261e0938cdeb3..2b9e68d3bf6ea0fd57a2e9832e06165380c648d0 100644 (file)
--- 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;
        }