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

Only add the first algorithm of a kind to IKEv1 transforms

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:30:48 +01:00
parent 5351d63c79
commit cd89f1a074
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/proposal_substructure.c
+4 -4
View File
@@ -770,7 +770,7 @@ static void set_from_proposal_v1_ike(private_proposal_substructure_t *this,
0, IKEV1_TRANSID_KEY_IKE); 0, IKEV1_TRANSID_KEY_IKE);
enumerator = proposal->create_enumerator(proposal, ENCRYPTION_ALGORITHM); enumerator = proposal->create_enumerator(proposal, ENCRYPTION_ALGORITHM);
while (enumerator->enumerate(enumerator, &alg, &key_size)) if (enumerator->enumerate(enumerator, &alg, &key_size))
{ {
alg = get_ikev1_from_alg(ENCRYPTION_ALGORITHM, alg); alg = get_ikev1_from_alg(ENCRYPTION_ALGORITHM, alg);
if (alg) if (alg)
@@ -790,7 +790,7 @@ static void set_from_proposal_v1_ike(private_proposal_substructure_t *this,
/* encode the integrity algorithm as hash and assume use the same PRF */ /* encode the integrity algorithm as hash and assume use the same PRF */
enumerator = proposal->create_enumerator(proposal, INTEGRITY_ALGORITHM); enumerator = proposal->create_enumerator(proposal, INTEGRITY_ALGORITHM);
while (enumerator->enumerate(enumerator, &alg, &key_size)) if (enumerator->enumerate(enumerator, &alg, &key_size))
{ {
alg = get_ikev1_from_alg(INTEGRITY_ALGORITHM, alg); alg = get_ikev1_from_alg(INTEGRITY_ALGORITHM, alg);
if (alg) if (alg)
@@ -803,7 +803,7 @@ static void set_from_proposal_v1_ike(private_proposal_substructure_t *this,
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
enumerator = proposal->create_enumerator(proposal, DIFFIE_HELLMAN_GROUP); enumerator = proposal->create_enumerator(proposal, DIFFIE_HELLMAN_GROUP);
while (enumerator->enumerate(enumerator, &alg, &key_size)) if (enumerator->enumerate(enumerator, &alg, &key_size))
{ {
transform->add_transform_attribute(transform, transform->add_transform_attribute(transform,
transform_attribute_create_value(TRANSFORM_ATTRIBUTE_V1, transform_attribute_create_value(TRANSFORM_ATTRIBUTE_V1,
@@ -854,7 +854,7 @@ static void set_from_proposal_v1_esp(private_proposal_substructure_t *this,
} }
enumerator = proposal->create_enumerator(proposal, INTEGRITY_ALGORITHM); enumerator = proposal->create_enumerator(proposal, INTEGRITY_ALGORITHM);
while (enumerator->enumerate(enumerator, &alg, &key_size)) if (enumerator->enumerate(enumerator, &alg, &key_size))
{ {
alg = get_ikev1_from_alg(INTEGRITY_ALGORITHM, alg); alg = get_ikev1_from_alg(INTEGRITY_ALGORITHM, alg);
if (alg) if (alg)