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

proposal-substructure: Store transform number for IKEv1 proposals

Browse Source
This commit is contained in:
Tobias Brunner
2020-03-06 10:31:30 +01:00
parent e630f2d373
commit 7da3143aac
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/proposal_substructure.c
+14 -9
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2012-2014 Tobias Brunner * Copyright (C) 2012-2020 Tobias Brunner
* Copyright (C) 2005-2010 Martin Willi * Copyright (C) 2005-2010 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* HSR Hochschule fuer Technik Rapperswil * HSR Hochschule fuer Technik Rapperswil
@@ -1004,18 +1004,25 @@ METHOD(proposal_substructure_t, get_proposals, void,
enumerator = this->transforms->create_enumerator(this->transforms); enumerator = this->transforms->create_enumerator(this->transforms);
while (enumerator->enumerate(enumerator, &transform)) while (enumerator->enumerate(enumerator, &transform))
{ {
if (!proposal)
{
proposal = proposal_create(this->protocol_id, this->proposal_number);
proposal->set_spi(proposal, spi);
proposals->insert_last(proposals, proposal);
}
if (this->type == PLV2_PROPOSAL_SUBSTRUCTURE) if (this->type == PLV2_PROPOSAL_SUBSTRUCTURE)
{ {
if (!proposal)
{
proposal = proposal_create(this->protocol_id,
this->proposal_number);
proposal->set_spi(proposal, spi);
proposals->insert_last(proposals, proposal);
}
add_to_proposal_v2(proposal, transform); add_to_proposal_v2(proposal, transform);
} }
else else
{ {
/* create a new proposal for each transform in IKEv1 */
proposal = proposal_create_v1(
this->protocol_id, this->proposal_number,
transform->get_transform_type_or_number(transform));
proposal->set_spi(proposal, spi);
proposals->insert_last(proposals, proposal);
switch (this->protocol_id) switch (this->protocol_id)
{ {
case PROTO_IKE: case PROTO_IKE:
@@ -1028,8 +1035,6 @@ METHOD(proposal_substructure_t, get_proposals, void,
default: default:
break; break;
} }
/* create a new proposal for each transform in IKEv1 */
proposal = NULL;
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);