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

proposal-substructure: Encode additional key exchange methods

Browse Source
This commit is contained in:
Tobias Brunner
2024-08-07 16:20:18 +02:00
parent 9cc5f4a511
commit 3e0495745c
1 changed files with 27 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/proposal_substructure.c
+25 -46
View File
@@ -1443,22 +1443,21 @@ static void set_from_proposal_v1(private_proposal_substructure_t *this,
} }
/** /**
* Add an IKEv2 proposal to the substructure * Encode all transforms of the given type
*/ */
static void set_from_proposal_v2(private_proposal_substructure_t *this, static void encode_transforms_v2(private_proposal_substructure_t *this,
proposal_t *proposal) proposal_t *proposal, transform_type_t type)
{ {
transform_substructure_t *transform; transform_substructure_t *transform;
uint16_t alg, key_size;
enumerator_t *enumerator; enumerator_t *enumerator;
uint16_t alg, key_size;
/* encryption algorithm is only available in ESP */ enumerator = proposal->create_enumerator(proposal, type);
enumerator = proposal->create_enumerator(proposal, ENCRYPTION_ALGORITHM);
while (enumerator->enumerate(enumerator, &alg, &key_size)) while (enumerator->enumerate(enumerator, &alg, &key_size))
{ {
transform = transform_substructure_create_type(PLV2_TRANSFORM_SUBSTRUCTURE, transform = transform_substructure_create_type(
ENCRYPTION_ALGORITHM, alg); PLV2_TRANSFORM_SUBSTRUCTURE, type, alg);
if (key_size) if (type == ENCRYPTION_ALGORITHM && key_size)
{ {
transform->add_transform_attribute(transform, transform->add_transform_attribute(transform,
transform_attribute_create_value(PLV2_TRANSFORM_ATTRIBUTE, transform_attribute_create_value(PLV2_TRANSFORM_ATTRIBUTE,
@@ -1467,46 +1466,26 @@ static void set_from_proposal_v2(private_proposal_substructure_t *this,
add_transform_substructure(this, transform); add_transform_substructure(this, transform);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
/* integrity algorithms */
enumerator = proposal->create_enumerator(proposal, INTEGRITY_ALGORITHM);
while (enumerator->enumerate(enumerator, &alg, &key_size))
{
transform = transform_substructure_create_type(PLV2_TRANSFORM_SUBSTRUCTURE,
INTEGRITY_ALGORITHM, alg);
add_transform_substructure(this, transform);
} }
enumerator->destroy(enumerator);
/* prf algorithms */ /**
enumerator = proposal->create_enumerator(proposal, PSEUDO_RANDOM_FUNCTION); * Add an IKEv2 proposal to the substructure
while (enumerator->enumerate(enumerator, &alg, &key_size)) */
static void set_from_proposal_v2(private_proposal_substructure_t *this,
proposal_t *proposal)
{ {
transform = transform_substructure_create_type(PLV2_TRANSFORM_SUBSTRUCTURE, encode_transforms_v2(this, proposal, ENCRYPTION_ALGORITHM);
PSEUDO_RANDOM_FUNCTION, alg); encode_transforms_v2(this, proposal, INTEGRITY_ALGORITHM);
add_transform_substructure(this, transform); encode_transforms_v2(this, proposal, PSEUDO_RANDOM_FUNCTION);
} encode_transforms_v2(this, proposal, KEY_EXCHANGE_METHOD);
enumerator->destroy(enumerator); encode_transforms_v2(this, proposal, ADDITIONAL_KEY_EXCHANGE_1);
encode_transforms_v2(this, proposal, ADDITIONAL_KEY_EXCHANGE_2);
/* dh groups */ encode_transforms_v2(this, proposal, ADDITIONAL_KEY_EXCHANGE_3);
enumerator = proposal->create_enumerator(proposal, KEY_EXCHANGE_METHOD); encode_transforms_v2(this, proposal, ADDITIONAL_KEY_EXCHANGE_4);
while (enumerator->enumerate(enumerator, &alg, NULL)) encode_transforms_v2(this, proposal, ADDITIONAL_KEY_EXCHANGE_5);
{ encode_transforms_v2(this, proposal, ADDITIONAL_KEY_EXCHANGE_6);
transform = transform_substructure_create_type(PLV2_TRANSFORM_SUBSTRUCTURE, encode_transforms_v2(this, proposal, ADDITIONAL_KEY_EXCHANGE_7);
KEY_EXCHANGE_METHOD, alg); encode_transforms_v2(this, proposal, EXTENDED_SEQUENCE_NUMBERS);
add_transform_substructure(this, transform);
}
enumerator->destroy(enumerator);
/* extended sequence numbers */
enumerator = proposal->create_enumerator(proposal, EXTENDED_SEQUENCE_NUMBERS);
while (enumerator->enumerate(enumerator, &alg, NULL))
{
transform = transform_substructure_create_type(PLV2_TRANSFORM_SUBSTRUCTURE,
EXTENDED_SEQUENCE_NUMBERS, alg);
add_transform_substructure(this, transform);
}
enumerator->destroy(enumerator);
} }
/** /**