commit c13a81f7f96a6433709b90c343d358c93cc7b9f8 Author: Kris Katterjohn katterjohn@gmail.com Date: Sun Dec 23 14:51:45 2018 -0600

Fix (and make consistent) the use of OpenBSD preprocessor macro tests

Prior to this commit, the testsuite was failing on OpenBSD. After this commit the testsuite runs fine on OpenBSD.

It was previously decided to test for the OpenBSD macro (rather than __OpenBSD__, etc.) because OpenBSD forks seem to have the former macro defined. sys/param.h must be included for the OpenBSD macro definition; however, many files tested for the OpenBSD macro without having this header included.

This commit includes sys/param.h in the files where the OpenBSD macro is used (and sys/param.h is not already included), and it also changes some instances of the __OpenBSD__ macro to OpenBSD.

See commit 27df23abb675ffeb198bf0c1cc85c4baed77a988 which changed everything to use OpenBSD instead of __OpenBSD__ or OPENBSD. See also tickets #6982 and #20980 (the latter ticket is where it was decided to use the OpenBSD macro).

Signed-off-by: Kris Katterjohn katterjohn@gmail.com --- src/app/config/config.c | 3 +++ src/core/or/connection_edge.c | 3 +++ src/ext/byteorder.h | 4 ++++ src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +- src/ext/trunnel/trunnel.c | 6 +++++- src/lib/err/backtrace.c | 3 +++ src/lib/net/inaddr_st.h | 5 ++++- src/test/test-memwipe.c | 4 ++++ src/test/test_options.c | 4 ++++ 9 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c index 4a8f94da0..c71ed0184 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -131,6 +131,9 @@ #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 58aefcf8f..2ec83c120 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -139,6 +139,9 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif

#if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H) #include <net/if.h> diff --git a/src/ext/byteorder.h b/src/ext/byteorder.h index c8ba52184..95e080b14 100644 --- a/src/ext/byteorder.h +++ b/src/ext/byteorder.h @@ -29,6 +29,10 @@ Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) */

+#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + /* This code is extracted from csiphash.h */

#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ diff --git a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h index 26a264cf9..3e0f9cfc5 100644 --- a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h +++ b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h @@ -14,7 +14,7 @@ #define OS_OSX #elif defined(macintosh) || defined(Macintosh) #define OS_MAC - #elif defined(__OpenBSD__) + #elif defined(OpenBSD) #define OS_OPENBSD #endif #endif diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index b749d8136..2442bc390 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -14,6 +14,10 @@ #include <stdlib.h> #include <string.h>

+#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ # define IS_LITTLE_ENDIAN 1 @@ -31,7 +35,7 @@ # define IS_LITTLE_ENDIAN # endif #else -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) # include <sys/endian.h> # else # include <endian.h> diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index d18a595c3..b568c888c 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -32,6 +32,9 @@ #ifdef HAVE_SIGNAL_H #include <signal.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #include <errno.h> #include <stdlib.h> #include <string.h> diff --git a/src/lib/net/inaddr_st.h b/src/lib/net/inaddr_st.h index dc4c6e3a0..a6b779626 100644 --- a/src/lib/net/inaddr_st.h +++ b/src/lib/net/inaddr_st.h @@ -28,6 +28,9 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif

#ifdef _WIN32 #include <winsock2.h> @@ -60,7 +63,7 @@ struct in6_addr /** @{ */ /** Many BSD variants seem not to define these. */ #if defined(__APPLE__) || defined(__darwin__) || \ - defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) #ifndef s6_addr16 #define s6_addr16 __u6_addr.__u6_addr16 #endif diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index c879013ed..b00e854a1 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -12,6 +12,10 @@ #include <sys/types.h> #include <stdlib.h>

+#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + static unsigned fill_a_buffer_memset(void) __attribute__((noinline)); static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline)); static unsigned fill_a_buffer_nothing(void) __attribute__((noinline)); diff --git a/src/test/test_options.c b/src/test/test_options.c index f14e620ee..dd24ff441 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -23,6 +23,10 @@ #include "test/test_helpers.h" #include "lib/net/resolve.h"

+#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #define NS_MODULE test_options

typedef struct {