summaryrefslogtreecommitdiff
path: root/sbin/iked/ikev2.c
diff options
context:
space:
mode:
authorMike Belopuhov <mikeb@cvs.openbsd.org>2010-12-23 15:11:20 +0000
committerMike Belopuhov <mikeb@cvs.openbsd.org>2010-12-23 15:11:20 +0000
commitd294f8fdd29f9f6e89e54c3c05f33e7679c42b6e (patch)
tree3011753120f87659ab62c77c0d7bad007d0b4dff /sbin/iked/ikev2.c
parent4feee81a5272cfad5a5fa934ba6a4b79a14faae0 (diff)
always add a none payload, should fix ike sa rekeying for responders; ok reyk
Diffstat (limited to 'sbin/iked/ikev2.c')
-rw-r--r--sbin/iked/ikev2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c
index 7cda085070e..88763cc3855 100644
--- a/sbin/iked/ikev2.c
+++ b/sbin/iked/ikev2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev2.c,v 1.28 2010/12/22 17:53:54 reyk Exp $ */
+/* $OpenBSD: ikev2.c,v 1.29 2010/12/23 15:11:19 mikeb Exp $ */
/* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */
/*
@@ -2428,11 +2428,11 @@ ikev2_resp_create_child_sa(struct iked *env, struct iked_message *msg)
goto done;
if ((len = ikev2_add_ts(e, IKEV2_PAYLOAD_TSr, sa)) == -1)
goto done;
-
- if (ikev2_next_payload(pld, len, IKEV2_PAYLOAD_NONE) == -1)
- goto done;
}
+ if (ikev2_next_payload(pld, len, IKEV2_PAYLOAD_NONE) == -1)
+ goto done;
+
ret = ikev2_msg_send_encrypt(env, sa, &e,
IKEV2_EXCHANGE_CREATE_CHILD_SA, IKEV2_PAYLOAD_SA, 1);