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

En- and decode DH group attribute in quick mode SA payloads

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:14 +01:00
parent fb8bc6a764
commit 9bb4de1d83
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/proposal_substructure.c
+13
View File
@@ -684,6 +684,10 @@ static void add_to_proposal_v1_esp(proposal_t *proposal,
proposal->add_algorithm(proposal, INTEGRITY_ALGORITHM, proposal->add_algorithm(proposal, INTEGRITY_ALGORITHM,
get_alg_from_ikev1(INTEGRITY_ALGORITHM, value), 0); get_alg_from_ikev1(INTEGRITY_ALGORITHM, value), 0);
break; break;
case TATTR_PH2_GROUP:
proposal->add_algorithm(proposal, DIFFIE_HELLMAN_GROUP,
value, 0);
break;
default: default:
/* TODO-IKEv1: lifetimes other attributes */ /* TODO-IKEv1: lifetimes other attributes */
break; break;
@@ -1076,6 +1080,15 @@ static void set_from_proposal_v1_esp(private_proposal_substructure_t *this,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
enumerator = proposal->create_enumerator(proposal, DIFFIE_HELLMAN_GROUP);
if (enumerator->enumerate(enumerator, &alg, &key_size))
{
transform->add_transform_attribute(transform,
transform_attribute_create_value(TRANSFORM_ATTRIBUTE_V1,
TATTR_PH2_GROUP, alg));
}
enumerator->destroy(enumerator);
transform->add_transform_attribute(transform, transform->add_transform_attribute(transform,
transform_attribute_create_value(TRANSFORM_ATTRIBUTE_V1, transform_attribute_create_value(TRANSFORM_ATTRIBUTE_V1,
TATTR_PH2_ENCAP_MODE, get_ikev1_mode(mode, udp))); TATTR_PH2_ENCAP_MODE, get_ikev1_mode(mode, udp)));