aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/encoding
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2017-05-04 11:29:50 +0200
committerTobias Brunner <tobias@strongswan.org>2017-05-19 15:29:37 +0200
commit08b19dd02a4911c07a0c636726af05a5c537bc64 (patch)
tree9ad64769c2ce37abad0db2b5e4a1d1faedafb002 /src/libcharon/encoding
parent746e88406cf4d2313364e38ce6d016e32ed360d1 (diff)
downloadstrongswan-08b19dd02a4911c07a0c636726af05a5c537bc64.tar.bz2
strongswan-08b19dd02a4911c07a0c636726af05a5c537bc64.tar.xz
ikev1: Send NAT-D payloads after HASH payloads in Aggressive Mode requests
Some implementations seem to have problems if the third AM message contains NAT-D payloads before the HASH payload. Fixes #2314.
Diffstat (limited to 'src/libcharon/encoding')
-rw-r--r--src/libcharon/encoding/message.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcharon/encoding/message.c b/src/libcharon/encoding/message.c
index 50dab9e38..6d850aac0 100644
--- a/src/libcharon/encoding/message.c
+++ b/src/libcharon/encoding/message.c
@@ -554,10 +554,10 @@ static payload_order_t aggressive_i_order[] = {
{PLV1_CERTREQ, 0},
{PLV1_NOTIFY, 0},
{PLV1_VENDOR_ID, 0},
+ {PLV1_HASH, 0},
{PLV1_NAT_D, 0},
{PLV1_NAT_D_DRAFT_00_03, 0},
{PLV1_SIGNATURE, 0},
- {PLV1_HASH, 0},
{PLV1_FRAGMENT, 0},
};