diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-09-12 01:22:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-09-12 01:22:39 +0000 |
| commit | 7a1317d94a0a3de298a26b8634b903ff68fc9ac4 (patch) | |
| tree | 0ddc339e4dfa78901491cb1a88001ecb9e469edb /usr.bin/ssh/moduli.c | |
| parent | ce5053b0e1b2f389aa479c359b7837ef05716408 (diff) | |
Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then use those definitions
rather than pulling <sys/param.h> and unknown namespace pollution.
ok djm markus dtucker
Diffstat (limited to 'usr.bin/ssh/moduli.c')
| -rw-r--r-- | usr.bin/ssh/moduli.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/moduli.c b/usr.bin/ssh/moduli.c index 245333de489..0c9b51c1611 100644 --- a/usr.bin/ssh/moduli.c +++ b/usr.bin/ssh/moduli.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moduli.c,v 1.30 2015/01/20 23:14:00 deraadt Exp $ */ +/* $OpenBSD: moduli.c,v 1.31 2016/09/12 01:22:38 deraadt Exp $ */ /* * Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> @@ -37,7 +37,6 @@ * Second step: test primes' safety (processor intensive) */ -#include <sys/param.h> /* MAX */ #include <sys/types.h> #include <openssl/bn.h> @@ -603,7 +602,7 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted, if (checkpoint_file != NULL) last_processed = read_checkpoint(checkpoint_file); - last_processed = start_lineno = MAX(last_processed, start_lineno); + last_processed = start_lineno = MAXIMUM(last_processed, start_lineno); if (end_lineno == ULONG_MAX) debug("process from line %lu from pipe", last_processed); else |