Fix UHASH build on *BSD

3 files changed, 31 insertions, 2 deletions

diff --git a/src/crypto/mac/uhash/builtin/uhash_builtin.c b/src/crypto/mac/uhash/builtin/uhash_builtin.c
index 07ee749..e4710ae 100644
--- a/src/crypto/mac/uhash/builtin/uhash_builtin.c
+++ b/src/crypto/mac/uhash/builtin/uhash_builtin.c
@@ -35,8 +35,6 @@
 #include "../../../../util.h"
 #include "../../../../log.h"
 
-#include <endian.h>
-
 
 /** MAC state used by this UHASH implmentation */
 struct fastd_mac_state {
diff --git a/src/fastd_config.h.in b/src/fastd_config.h.in
index 9949eca..e396bf8 100644
--- a/src/fastd_config.h.in
+++ b/src/fastd_config.h.in
@@ -41,6 +41,14 @@
 /** Defined if the platform defines get_current_dir_name() */
 #cmakedefine HAVE_GET_CURRENT_DIR_NAME
 
+/** Defined if <endian.h> exists */
+#cmakedefine HAVE_ENDIAN_H
+
+/** Defined if <sys/endian.h> exists */
+#cmakedefine HAVE_SYS_ENDIAN_H
+
+/** Defined if be32toh etc. exist */
+#cmakedefine HAVE_LINUX_ENDIAN
 
 /** Defined if the platform supports SO_BINDTODEVICE */
 #cmakedefine USE_BINDTODEVICE
diff --git a/src/util.h b/src/util.h
index fe6720b..3acc42f 100644
--- a/src/util.h
+++ b/src/util.h
@@ -32,6 +32,18 @@
 
 #pragma once
 
+
+#include <sys/types.h>
+
+#ifdef HAVE_ENDIAN_H
+#include <endian.h>
+#endif
+
+#ifdef HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#endif
+
+
 /**
    Returns a pointer to a data structure, given the address of a member contained in the structure
 
@@ -91,3 +103,14 @@ static inline size_t max_size_t(size_t a, size_t b) {
 static inline size_t min_size_t(size_t a, size_t b) {
 	return (a < b) ? a : b;
 }
+
+
+#ifndef HAVE_LINUX_ENDIAN
+
+/** converts a 32bit integer from big endian to host byte order */
+#define be32toh(x) betoh32(x)
+
+/** converts a 32bit integer from little endian to host byte order */
+#define le32toh(x) letoh32(x)
+
+#endif