Reuse existing DH value when retrying IKE_SA_INIT with a COOKIE

diff --git a/src/libcharon/sa/tasks/ike_init.c b/src/libcharon/sa/tasks/ike_init.c
index b8e66c7..dd8a4b0 100644 (file)
--- a/src/libcharon/sa/tasks/ike_init.c
+++ b/src/libcharon/sa/tasks/ike_init.c
@@ -517,8 +517,11 @@ METHOD(task_t, migrate, void,
        this->ike_sa = ike_sa;
        this->keymat = ike_sa->get_keymat(ike_sa);
        this->proposal = NULL;
        this->ike_sa = ike_sa;
        this->keymat = ike_sa->get_keymat(ike_sa);
        this->proposal = NULL;

-       DESTROY_IF(this->dh);
-       this->dh = this->keymat->create_dh(this->keymat, this->dh_group);
+       if (this->dh && this->dh->get_dh_group(this->dh) != this->dh_group)
+       {       /* reset DH value only if group changed (INVALID_KE_PAYLOAD) */
+               this->dh->destroy(this->dh);
+               this->dh = this->keymat->create_dh(this->keymat, this->dh_group);
+       }

 }
 
 METHOD(task_t, destroy, void,
 }
 
 METHOD(task_t, destroy, void,