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

ikev1: Send NAT-D payloads after vendor ID payloads in Aggressive Mode messages

Browse Source 
Some implementations might otherwise not recognize the NAT-D payload
type.  Also moves SIG and HASH payloads last in these messages.

Fixes #1239.
This commit is contained in:
Tobias Brunner
2016-03-07 14:13:12 +01:00
parent d8adcb8ff9
commit fab4c845ec
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/message.c
+6 -6
View File
@@ -551,13 +551,13 @@ static payload_order_t aggressive_i_order[] = {
{PLV1_NONCE, 0}, {PLV1_NONCE, 0},
{PLV1_ID, 0}, {PLV1_ID, 0},
{PLV1_CERTIFICATE, 0}, {PLV1_CERTIFICATE, 0},
{PLV1_CERTREQ, 0},
{PLV1_NOTIFY, 0},
{PLV1_VENDOR_ID, 0},
{PLV1_NAT_D, 0}, {PLV1_NAT_D, 0},
{PLV1_NAT_D_DRAFT_00_03, 0}, {PLV1_NAT_D_DRAFT_00_03, 0},
{PLV1_SIGNATURE, 0}, {PLV1_SIGNATURE, 0},
{PLV1_HASH, 0}, {PLV1_HASH, 0},
{PLV1_CERTREQ, 0},
{PLV1_NOTIFY, 0},
{PLV1_VENDOR_ID, 0},
{PLV1_FRAGMENT, 0}, {PLV1_FRAGMENT, 0},
}; };
@@ -591,13 +591,13 @@ static payload_order_t aggressive_r_order[] = {
{PLV1_NONCE, 0}, {PLV1_NONCE, 0},
{PLV1_ID, 0}, {PLV1_ID, 0},
{PLV1_CERTIFICATE, 0}, {PLV1_CERTIFICATE, 0},
{PLV1_CERTREQ, 0},
{PLV1_NOTIFY, 0},
{PLV1_VENDOR_ID, 0},
{PLV1_NAT_D, 0}, {PLV1_NAT_D, 0},
{PLV1_NAT_D_DRAFT_00_03, 0}, {PLV1_NAT_D_DRAFT_00_03, 0},
{PLV1_SIGNATURE, 0}, {PLV1_SIGNATURE, 0},
{PLV1_HASH, 0}, {PLV1_HASH, 0},
{PLV1_CERTREQ, 0},
{PLV1_NOTIFY, 0},
{PLV1_VENDOR_ID, 0},
{PLV1_FRAGMENT, 0}, {PLV1_FRAGMENT, 0},
}; };