From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 30 Jan 2018 10:33:15 +0000 (+0100)
Subject: ikev1: Properly handle fragmented Quick Mode messages
X-Git-Tag: 5.6.2rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=626e8a31d08f4c458ed0693f76f0579de5735a1e;p=thirdparty%2Fstrongswan.git

ikev1: Properly handle fragmented Quick Mode messages
---

diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c
index 6d850aac05..735526e3c0 100644
--- a/src/libcharon/encoding/message.c
+++ b/src/libcharon/encoding/message.c
@@ -657,6 +657,7 @@ static payload_rule_t quick_mode_i_rules[] = {
 	{PLV1_ID,						0,	2,						TRUE,	FALSE},
 	{PLV1_NAT_OA,					0,	2,						TRUE,	FALSE},
 	{PLV1_NAT_OA_DRAFT_00_03,		0,	2,						TRUE,	FALSE},
+	{PLV1_FRAGMENT,					0,	1,						FALSE,	TRUE},
 };
 
 /**
@@ -673,6 +674,7 @@ static payload_order_t quick_mode_i_order[] = {
 	{PLV1_ID,						0},
 	{PLV1_NAT_OA,					0},
 	{PLV1_NAT_OA_DRAFT_00_03,		0},
+	{PLV1_FRAGMENT,					0},
 };
 
 /**
@@ -689,6 +691,7 @@ static payload_rule_t quick_mode_r_rules[] = {
 	{PLV1_ID,						0,	2,						TRUE,	FALSE},
 	{PLV1_NAT_OA,					0,	2,						TRUE,	FALSE},
 	{PLV1_NAT_OA_DRAFT_00_03,		0,	2,						TRUE,	FALSE},
+	{PLV1_FRAGMENT,					0,	1,						FALSE,	TRUE},
 };
 
 /**
@@ -705,6 +708,7 @@ static payload_order_t quick_mode_r_order[] = {
 	{PLV1_ID,						0},
 	{PLV1_NAT_OA,					0},
 	{PLV1_NAT_OA_DRAFT_00_03,		0},
+	{PLV1_FRAGMENT,					0},
 };
 
 /**