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

src/libcharon/encoding/generator.c

@@ -459,6 +459,7 @@ METHOD(generator_t, generate_payload, void,
 			case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE:
 			case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE_V1:
 			case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE:
+			case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1:
 			case PAYLOAD_LIST + TRAFFIC_SELECTOR_SUBSTRUCTURE:
 			{
 				linked_list_t *proposals;

src/libcharon/encoding/parser.c

@@ -493,6 +493,7 @@ METHOD(parser_t, parse_payload, status_t,
 			case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE:
 			case PAYLOAD_LIST + TRANSFORM_ATTRIBUTE_V1:
 			case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE:
+			case PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1:
 			case PAYLOAD_LIST + TRAFFIC_SELECTOR_SUBSTRUCTURE:
 			{
 				if (payload_length < header_length ||

src/libcharon/encoding/payloads/cp_payload.c

@@ -152,7 +152,7 @@ static encoding_rule_t encodings_v1[] = {
 	{ RESERVED_BYTE,	offsetof(private_cp_payload_t, reserved_byte[0])},
 	{ U_INT_16,			offsetof(private_cp_payload_t, identifier)},
 	/* list of configuration attributes in a list */
-	{ PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE,
+	{ PAYLOAD_LIST + CONFIGURATION_ATTRIBUTE_V1,
 						offsetof(private_cp_payload_t, attributes)		},
 };