From 715c892f0a5295b391ae92c26ef4d6a86ea96e8e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 22 Dec 2021 09:02:50 +1100 Subject: [PATCH] remove sys/param.h in -portable, after upstream --- atomicio.c | 1 - channels.c | 2 +- includes.h | 1 - loginrec.c | 3 ++- openbsd-compat/arc4random.c | 8 +++++--- openbsd-compat/base64.c | 1 - openbsd-compat/bcrypt_pbkdf.c | 1 - openbsd-compat/bsd-closefrom.c | 1 - openbsd-compat/bsd-statvfs.c | 1 - openbsd-compat/dirname.c | 1 - openbsd-compat/getcwd.c | 1 - openbsd-compat/inet_aton.c | 1 - openbsd-compat/inet_ntop.c | 1 - openbsd-compat/port-solaris.c | 1 - openbsd-compat/xcrypt.c | 4 +++- regress/misc/fuzz-harness/kex_fuzz.cc | 1 - regress/unittests/sshbuf/test_sshbuf.c | 2 ++ regress/unittests/test_helper/test_helper.c | 1 - sandbox-capsicum.c | 1 - session.c | 1 - sftp.c | 1 - ssh-agent.c | 1 - 22 files changed, 13 insertions(+), 23 deletions(-) diff --git a/atomicio.c b/atomicio.c index e00c9f0d4..765073357 100644 --- a/atomicio.c +++ b/atomicio.c @@ -28,7 +28,6 @@ #include "includes.h" -#include #include #include diff --git a/channels.c b/channels.c index 1c714c845..3368098e1 100644 --- a/channels.c +++ b/channels.c @@ -2027,7 +2027,7 @@ channel_handle_wfd(struct ssh *ssh, Channel *c, #ifdef _AIX /* XXX: Later AIX versions can't push as much data to tty */ if (c->wfd_isatty) - dlen = MIN(dlen, 8*1024); + dlen = MINIMUM(dlen, 8*1024); #endif len = write(c->wfd, buf, dlen); diff --git a/includes.h b/includes.h index 0fd71792e..6d17ef6da 100644 --- a/includes.h +++ b/includes.h @@ -23,7 +23,6 @@ #endif #include -#include #include /* For CMSG_* */ #ifdef HAVE_LIMITS_H diff --git a/loginrec.c b/loginrec.c index ea058fd6f..4f2149958 100644 --- a/loginrec.c +++ b/loginrec.c @@ -181,6 +181,7 @@ #include "auth.h" #include "sshbuf.h" #include "ssherr.h" +#include "misc.h" #ifdef HAVE_UTIL_H # include @@ -801,7 +802,7 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx) # endif # ifdef HAVE_SYSLEN_IN_UTMPX /* ut_syslen is the length of the utx_host string */ - utx->ut_syslen = MIN(strlen(li->hostname), sizeof(utx->ut_host)); + utx->ut_syslen = MINIMUM(strlen(li->hostname), sizeof(utx->ut_host)); # endif } #endif /* USE_UTMPX || USE_WTMPX */ diff --git a/openbsd-compat/arc4random.c b/openbsd-compat/arc4random.c index 14853aba4..80ff3c180 100644 --- a/openbsd-compat/arc4random.c +++ b/openbsd-compat/arc4random.c @@ -39,6 +39,8 @@ #ifndef HAVE_ARC4RANDOM +#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) + #ifdef WITH_OPENSSL #include #include @@ -170,7 +172,7 @@ _rs_rekey(u_char *dat, size_t datlen) if (dat) { size_t i, m; - m = MIN(datlen, KEYSZ + IVSZ); + m = MINIMUM(datlen, KEYSZ + IVSZ); for (i = 0; i < m; i++) rs_buf[i] ^= dat[i]; } @@ -189,7 +191,7 @@ _rs_random_buf(void *_buf, size_t n) _rs_stir_if_needed(n); while (n > 0) { if (rs_have > 0) { - m = MIN(n, rs_have); + m = MINIMUM(n, rs_have); memcpy(buf, rs_buf + RSBUFSZ - rs_have, m); memset(rs_buf + RSBUFSZ - rs_have, 0, m); buf += m; @@ -230,7 +232,7 @@ arc4random_addrandom(u_char *dat, int datlen) if (!rs_initialized) _rs_stir(); while (datlen > 0) { - m = MIN(datlen, KEYSZ + IVSZ); + m = MINIMUM(datlen, KEYSZ + IVSZ); _rs_rekey(dat, m); dat += m; datlen -= m; diff --git a/openbsd-compat/base64.c b/openbsd-compat/base64.c index b7dce095e..e5faba3c5 100644 --- a/openbsd-compat/base64.c +++ b/openbsd-compat/base64.c @@ -49,7 +49,6 @@ #if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON)) #include -#include #include #include #include diff --git a/openbsd-compat/bcrypt_pbkdf.c b/openbsd-compat/bcrypt_pbkdf.c index 95b150f81..5a22ba3b4 100644 --- a/openbsd-compat/bcrypt_pbkdf.c +++ b/openbsd-compat/bcrypt_pbkdf.c @@ -24,7 +24,6 @@ #ifndef HAVE_BCRYPT_PBKDF #include -#include #ifdef HAVE_STDLIB_H # include diff --git a/openbsd-compat/bsd-closefrom.c b/openbsd-compat/bsd-closefrom.c index 08b7da698..704da531f 100644 --- a/openbsd-compat/bsd-closefrom.c +++ b/openbsd-compat/bsd-closefrom.c @@ -19,7 +19,6 @@ #if !defined(HAVE_CLOSEFROM) || defined(BROKEN_CLOSEFROM) #include -#include #include #include #ifdef HAVE_FCNTL_H diff --git a/openbsd-compat/bsd-statvfs.c b/openbsd-compat/bsd-statvfs.c index 10d876439..18ca726cf 100644 --- a/openbsd-compat/bsd-statvfs.c +++ b/openbsd-compat/bsd-statvfs.c @@ -18,7 +18,6 @@ #if !defined(HAVE_STATVFS) || !defined(HAVE_FSTATVFS) -#include #ifdef HAVE_SYS_MOUNT_H # include #endif diff --git a/openbsd-compat/dirname.c b/openbsd-compat/dirname.c index 30fcb4968..127bc2ae1 100644 --- a/openbsd-compat/dirname.c +++ b/openbsd-compat/dirname.c @@ -23,7 +23,6 @@ #include #include -#include char * dirname(const char *path) diff --git a/openbsd-compat/getcwd.c b/openbsd-compat/getcwd.c index e4f7f5a3d..2d56bae19 100644 --- a/openbsd-compat/getcwd.c +++ b/openbsd-compat/getcwd.c @@ -34,7 +34,6 @@ #if !defined(HAVE_GETCWD) -#include #include #include #include diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c index 093a17203..5efcc5f03 100644 --- a/openbsd-compat/inet_aton.c +++ b/openbsd-compat/inet_aton.c @@ -56,7 +56,6 @@ #if !defined(HAVE_INET_ATON) #include -#include #include #include #include diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c index 3259037ba..c037f0805 100644 --- a/openbsd-compat/inet_ntop.c +++ b/openbsd-compat/inet_ntop.c @@ -22,7 +22,6 @@ #ifndef HAVE_INET_NTOP -#include #include #include #include diff --git a/openbsd-compat/port-solaris.c b/openbsd-compat/port-solaris.c index b84fbff5e..10c2d6b7f 100644 --- a/openbsd-compat/port-solaris.c +++ b/openbsd-compat/port-solaris.c @@ -19,7 +19,6 @@ #include #include -#include #include #ifdef HAVE_FCNTL_H diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index e493dd31f..9cded6684 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c @@ -59,6 +59,8 @@ # define crypt DES_crypt # endif +#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) + /* * Pick an appropriate password encryption type and salt for the running * system by searching through accounts until we find one that has a valid @@ -82,7 +84,7 @@ pick_salt(void) continue; if (passwd[0] == '$' && (p = strrchr(passwd+1, '$')) != NULL) { typelen = p - passwd + 1; - strlcpy(salt, passwd, MIN(typelen, sizeof(salt))); + strlcpy(salt, passwd, MINIMUM(typelen, sizeof(salt))); explicit_bzero(passwd, strlen(passwd)); goto out; } diff --git a/regress/misc/fuzz-harness/kex_fuzz.cc b/regress/misc/fuzz-harness/kex_fuzz.cc index 4740a7cb0..fc145d48d 100644 --- a/regress/misc/fuzz-harness/kex_fuzz.cc +++ b/regress/misc/fuzz-harness/kex_fuzz.cc @@ -2,7 +2,6 @@ #include -#include #include #include #include diff --git a/regress/unittests/sshbuf/test_sshbuf.c b/regress/unittests/sshbuf/test_sshbuf.c index 052d4f2ba..e22b390fe 100644 --- a/regress/unittests/sshbuf/test_sshbuf.c +++ b/regress/unittests/sshbuf/test_sshbuf.c @@ -23,7 +23,9 @@ void sshbuf_tests(void); +#ifndef roundup #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) +#endif void sshbuf_tests(void) diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c index de125fcd4..6461d7ffc 100644 --- a/regress/unittests/test_helper/test_helper.c +++ b/regress/unittests/test_helper/test_helper.c @@ -20,7 +20,6 @@ #include "includes.h" #include -#include #include #include diff --git a/sandbox-capsicum.c b/sandbox-capsicum.c index e10bad7e8..883be1858 100644 --- a/sandbox-capsicum.c +++ b/sandbox-capsicum.c @@ -19,7 +19,6 @@ #ifdef SANDBOX_CAPSICUM #include -#include #include #include #include diff --git a/session.c b/session.c index 5f423f9f6..fb2d70099 100644 --- a/session.c +++ b/session.c @@ -36,7 +36,6 @@ #include "includes.h" #include -#include #ifdef HAVE_SYS_STAT_H # include #endif diff --git a/sftp.c b/sftp.c index 418f312f7..8cb5917a9 100644 --- a/sftp.c +++ b/sftp.c @@ -22,7 +22,6 @@ #ifdef HAVE_SYS_STAT_H # include #endif -#include #include #include #ifdef HAVE_SYS_STATVFS_H diff --git a/ssh-agent.c b/ssh-agent.c index 390d8aa1c..f7d3390da 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -37,7 +37,6 @@ #include "includes.h" #include -#include #include #include #include