byteswap.h is not present on macOS

Projects like Chromium use a porting header to handle platform differences like these and a port.h is added to local include folder Signed-off-by: kozyilmaz <[email protected]>
fireblocks · May 12, 2024 · 2461299 · 2461299
1 parent 31e510b
commit 2461299
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/include/port.h b/include/port.h
@@ -0,0 +1,23 @@
+#ifndef __MPC_LIB_PORT_H__
+#define __MPC_LIB_PORT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+// byteswap
+#if defined(__APPLE__)
+  // Mac OS X / Darwin
+  #include <libkern/OSByteOrder.h>
+  #define bswap_16(x) OSSwapInt16(x)
+  #define bswap_32(x) OSSwapInt32(x)
+  #define bswap_64(x) OSSwapInt64(x)
+#else
+  #include <byteswap.h>
+#endif
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus
+
+#endif // __MPC_LIB_PORT_H__
diff --git a/src/common/crypto/GFp_curve_algebra/GFp_curve_algebra.c b/src/common/crypto/GFp_curve_algebra/GFp_curve_algebra.c
@@ -1,8 +1,8 @@
 #include "crypto/GFp_curve_algebra/GFp_curve_algebra.h"
+#include "port.h"
 
 #include <string.h>
 #include <assert.h>
-#include <byteswap.h>
 
 #include <openssl/bn.h>
 #include <openssl/err.h>

diff --git a/src/common/crypto/ed25519_algebra/ed25519_algebra.c b/src/common/crypto/ed25519_algebra/ed25519_algebra.c
@@ -3,7 +3,7 @@
 #include "crypto/keccak1600/keccak1600.h"
 #include "curve25519.c"
 
-#include <byteswap.h>
+#include "port.h"
 
 #include <openssl/bn.h>
 #include <openssl/sha.h>

diff --git a/src/common/crypto/zero_knowledge_proof/diffie_hellman_log.c b/src/common/crypto/zero_knowledge_proof/diffie_hellman_log.c
@@ -1,6 +1,6 @@
 #include "crypto/zero_knowledge_proof/diffie_hellman_log.h"
 #include "crypto/drng/drng.h"
-#include <byteswap.h>
+#include "port.h"
 #include <string.h>
 #include <openssl/sha.h>
 

diff --git a/test/crypto/ed25519_algebra/tests.cpp b/test/crypto/ed25519_algebra/tests.cpp
@@ -1,10 +1,10 @@
 #include "crypto/ed25519_algebra/ed25519_algebra.h"
 #include "crypto/elliptic_curve_algebra/elliptic_curve256_algebra.h"
+#include "port.h"
 
 #include <openssl/rand.h>
 #include <openssl/bn.h>
 
-#include <byteswap.h>
 #include <string.h>
 
 #include <tests/catch.hpp>

diff --git a/test/crypto/secp256k1_algebra/tests.cpp b/test/crypto/secp256k1_algebra/tests.cpp
@@ -1,11 +1,11 @@
 #include "crypto/GFp_curve_algebra/GFp_curve_algebra.h"
+#include "port.h"
 
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/objects.h>
 #include <openssl/rand.h>
 
-#include <byteswap.h>
 #include <string.h>
 
 #include <tests/catch.hpp>