summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorTobias Heider <tobhe@cvs.openbsd.org>2023-11-24 14:43:01 +0000
committerTobias Heider <tobhe@cvs.openbsd.org>2023-11-24 14:43:01 +0000
commit604be1f02d9b24356bb1cc79bfb562ffbe8380b9 (patch)
treedb5ee8b94d8b403f8997efb4f6b6292bc4c19586 /sbin
parent76e4933ff56a4dae36fe0b9f4838fd048e0f9e60 (diff)
Empty IKEv2 DPD messages should not contain extra NONE payloads
from markus@
Diffstat (limited to 'sbin')
-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 4b39b1f94d0..673327a8056 100644
--- a/sbin/iked/ikev2.c
+++ b/sbin/iked/ikev2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev2.c,v 1.379 2023/11/10 08:03:02 tobhe Exp $ */
+/* $OpenBSD: ikev2.c,v 1.380 2023/11/24 14:43:00 tobhe Exp $ */
/*
* Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de>
@@ -4034,10 +4034,10 @@ ikev2_send_ike_e(struct iked *env, struct iked_sa *sa, struct ibuf *buf,
if ((e = ibuf_static()) == NULL)
goto done;
- if ((pld = ikev2_add_payload(e)) == NULL)
- goto done;
-
if (buf) {
+ if ((pld = ikev2_add_payload(e)) == NULL)
+ goto done;
+
if (ibuf_add_buf(e, buf) != 0)
goto done;