From: deraadt <deraadt@openbsd.org>
Date: Mon, 29 Nov 2021 06:42:13 +0000 (+0000)
Subject: the code in this file has reason to include any sys/*.h header files,
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=13c7cd531ead41885c8d3fe2761d6fe0676cfb25;p=openbsd

the code in this file has reason to include any sys/*.h header files,
let alone sys/param.h, which it uses to get roundup().  make a local
copy of the macro, and call it a day.
---

diff --git a/sbin/isakmpd/dh.c b/sbin/isakmpd/dh.c
index f7b07c865d1..ca5f45b632b 100644
--- a/sbin/isakmpd/dh.c
+++ b/sbin/isakmpd/dh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dh.c,v 1.22 2021/05/13 14:28:03 tb Exp $	*/
+/*	$OpenBSD: dh.c,v 1.23 2021/11/29 06:42:13 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2010-2014 Reyk Floeter <reyk@openbsd.org>
@@ -16,7 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>	/* roundup */
 #include <string.h>
 
 #include <openssl/obj_mac.h>
@@ -27,6 +26,8 @@
 
 #include "dh.h"
 
+#define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
+
 int	dh_init(struct group *);
 
 int	modp_init(struct group *);