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

IKEv1 ConfigMode: Fixed cp_payload to use CONFIGURATION_ATTRIBUTE_V1 in all appropriate places, so the parsing is done correctly.

Browse Source
This commit is contained in:
Clavister OpenSource
2012-03-20 17:30:51 +01:00
parent 01685247b0
commit 0b6811b4a7
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/generator.c
+1
View File
@@ -459,6 +459,7 @@ METHOD(generator_t, generate_payload, void,
case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE: case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE:
case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE_V1: case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE_V1:
case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE: case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE:
case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1:
case PAYLOAD_LIST + TRAFFIC_SELECTOR_SUBSTRUCTURE: case PAYLOAD_LIST + TRAFFIC_SELECTOR_SUBSTRUCTURE:
{ {
linked_list_t *proposals; linked_list_t *proposals;
src/libcharon/encoding/parser.c
+1
View File
@@ -493,6 +493,7 @@ METHOD(parser_t, parse_payload, status_t,
case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE: case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE:
case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE_V1: case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE_V1:
case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE: case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE:
case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1:
case PAYLOAD_LIST + TRAFFIC_SELECTOR_SUBSTRUCTURE: case PAYLOAD_LIST + TRAFFIC_SELECTOR_SUBSTRUCTURE:
{ {
if (payload_length < header_length || if (payload_length < header_length ||
src/libcharon/encoding/payloads/cp_payload.c
+1 -1
View File
@@ -152,7 +152,7 @@ static encoding_rule_t encodings_v1[] = {
{ RESERVED_BYTE, offsetof(private_cp_payload_t, reserved_byte[0])}, { RESERVED_BYTE, offsetof(private_cp_payload_t, reserved_byte[0])},
{ U_INT_16, offsetof(private_cp_payload_t, identifier)}, { U_INT_16, offsetof(private_cp_payload_t, identifier)},
/* list of configuration attributes in a list */ /* list of configuration attributes in a list */
{ PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE, { PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1,
offsetof(private_cp_payload_t, attributes) }, offsetof(private_cp_payload_t, attributes) },
}; };