denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ikev2: Store proposal on IKE_SA before creating DH object

Browse Source 
This might be useful for custom implementations of keymat_t.
This commit is contained in:
Tobias Brunner
2016-09-06 09:38:22 +02:00
parent 4e8f5a189c
commit fd1662cdbd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/ike_init.c
+5 -2
View File
@@ -457,6 +457,11 @@ static void process_payloads(private_ike_init_t *this, message_t *message)
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
if (this->proposal)
{
this->ike_sa->set_proposal(this->ike_sa, this->proposal);
}
if (ke_payload && this->proposal && if (ke_payload && this->proposal &&
this->proposal->has_dh_group(this->proposal, this->dh_group)) this->proposal->has_dh_group(this->proposal, this->dh_group))
{ {
@@ -614,7 +619,6 @@ METHOD(task_t, build_r, status_t,
message->add_notify(message, TRUE, NO_PROPOSAL_CHOSEN, chunk_empty); message->add_notify(message, TRUE, NO_PROPOSAL_CHOSEN, chunk_empty);
return FAILED; return FAILED;
} }
this->ike_sa->set_proposal(this->ike_sa, this->proposal);
/* check if we'd have to redirect the client */ /* check if we'd have to redirect the client */
if (!this->old_sa && if (!this->old_sa &&
@@ -849,7 +853,6 @@ METHOD(task_t, process_i, status_t,
DBG1(DBG_IKE, "peers proposal selection invalid"); DBG1(DBG_IKE, "peers proposal selection invalid");
return FAILED; return FAILED;
} }
this->ike_sa->set_proposal(this->ike_sa, this->proposal);
if (this->dh == NULL || if (this->dh == NULL ||
!this->proposal->has_dh_group(this->proposal, this->dh_group)) !this->proposal->has_dh_group(this->proposal, this->dh_group))