diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-11-29 06:43:43 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-11-29 06:43:43 +0000 |
| commit | 39aa4bfebec924182edd0f0bb709479cf29d1140 (patch) | |
| tree | 1dcd506cfda209c7a773ce1dc2d604ea943de417 /sbin/iked/ikev2.c | |
| parent | eff5a06510dd0c17bca5d92dd7e21c0d11678d58 (diff) | |
sys/param.h was included for MAX(), MIN() and roundup(). make local
copies of MAXIMUM() and MINIMUM() like we have done in 50+ other places,
and also include a roundup()
ok jsg
Diffstat (limited to 'sbin/iked/ikev2.c')
| -rw-r--r-- | sbin/iked/ikev2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c index 8cbbfcaa46d..4dcb12bca89 100644 --- a/sbin/iked/ikev2.c +++ b/sbin/iked/ikev2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ikev2.c,v 1.337 2021/11/27 21:50:05 tobhe Exp $ */ +/* $OpenBSD: ikev2.c,v 1.338 2021/11/29 06:43:42 deraadt Exp $ */ /* * Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de> @@ -17,7 +17,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> /* roundup */ +#include <sys/types.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/uio.h> @@ -4177,7 +4177,7 @@ ikev2_nonce_cmp(struct ibuf *a, struct ibuf *b) alen = ibuf_length(a); blen = ibuf_length(b); - len = MIN(alen, blen); + len = MINIMUM(alen, blen); ret = memcmp(ibuf_data(a), ibuf_data(b), len); if (ret == 0) ret = (alen < blen ? -1 : 1); |