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

ike-init: Promote selected DH group and demote proposals that don't contain it

Browse Source
This commit is contained in:
Tobias Brunner
2018-02-09 10:20:05 +01:00
parent d9c9b7b832
commit ff79020cd2
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/ike_init.c
+20 -5
View File
@@ -282,7 +282,7 @@ static bool build_payloads(private_ike_init_t *this, message_t *message)
sa_payload_t *sa_payload; sa_payload_t *sa_payload;
ke_payload_t *ke_payload; ke_payload_t *ke_payload;
nonce_payload_t *nonce_payload; nonce_payload_t *nonce_payload;
linked_list_t *proposal_list; linked_list_t *proposal_list, *other_dh_groups;
ike_sa_id_t *id; ike_sa_id_t *id;
proposal_t *proposal; proposal_t *proposal;
enumerator_t *enumerator; enumerator_t *enumerator;
@@ -294,16 +294,31 @@ static bool build_payloads(private_ike_init_t *this, message_t *message)
if (this->initiator) if (this->initiator)
{ {
proposal_list = this->config->get_proposals(this->config); proposal_list = this->config->get_proposals(this->config);
if (this->old_sa) other_dh_groups = linked_list_create();
enumerator = proposal_list->create_enumerator(proposal_list);
while (enumerator->enumerate(enumerator, (void**)&proposal))
{ {
/* include SPI of new IKE_SA when we are rekeying */ /* include SPI of new IKE_SA when we are rekeying */
enumerator = proposal_list->create_enumerator(proposal_list); if (this->old_sa)
while (enumerator->enumerate(enumerator, (void**)&proposal))
{ {
proposal->set_spi(proposal, id->get_initiator_spi(id)); proposal->set_spi(proposal, id->get_initiator_spi(id));
} }
enumerator->destroy(enumerator); /* move the selected DH group to the front of the proposal */
if (!proposal->promote_dh_group(proposal, this->dh_group))
{ /* the proposal does not include the group, move to the back */
proposal_list->remove_at(proposal_list, enumerator);
other_dh_groups->insert_last(other_dh_groups, proposal);
}
} }
enumerator->destroy(enumerator);
/* add proposals that don't contain the selected group */
enumerator = other_dh_groups->create_enumerator(other_dh_groups);
while (enumerator->enumerate(enumerator, (void**)&proposal))
{ /* no need to remove from the list as we destroy it anyway*/
proposal_list->insert_last(proposal_list, proposal);
}
enumerator->destroy(enumerator);
other_dh_groups->destroy(other_dh_groups);
sa_payload = sa_payload_create_from_proposals_v2(proposal_list); sa_payload = sa_payload_create_from_proposals_v2(proposal_list);
proposal_list->destroy_offset(proposal_list, offsetof(proposal_t, destroy)); proposal_list->destroy_offset(proposal_list, offsetof(proposal_t, destroy));