From 255dee7a5ee0fcf146ee68d6b812c311050b10ba Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Fri, 25 Sep 2020 14:32:53 -0400
Subject: [PATCH] MacOS build fixes.

---
 make-mac.mk        | 2 +-
 node/AES.cpp       | 4 ----
 node/Constants.hpp | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/make-mac.mk b/make-mac.mk
index 02765d24e..e92604f6c 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -40,7 +40,7 @@ ifeq ($(ZT_OFFICIAL_RELEASE),1)
 	ZT_USE_MINIUPNPC=1
 	CODESIGN=codesign
 	PRODUCTSIGN=productsign
-	CODESIGN_APP_CERT="Developer ID Application: ZeroTier, Inc (8ZD9JUCZ4V)"
+	CODESIGN_APP_CERT="Apple Distribution: ZeroTier, Inc (8ZD9JUCZ4V)"
 	CODESIGN_INSTALLER_CERT="Developer ID Installer: ZeroTier, Inc (8ZD9JUCZ4V)"
 	NOTARIZE=xcrun altool
 	NOTARIZE_USER_ID="adam.ierymenko@gmail.com"
diff --git a/node/AES.cpp b/node/AES.cpp
index 2a1bac79a..87ca39c83 100644
--- a/node/AES.cpp
+++ b/node/AES.cpp
@@ -18,10 +18,6 @@
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif
 
-#ifdef __APPLE__
-#include <arm_neon.h>
-#endif
-
 #define Te1_r(x) ZT_ROR32(Te0[x], 8U)
 #define Te2_r(x) ZT_ROR32(Te0[x], 16U)
 #define Te3_r(x) ZT_ROR32(Te0[x], 24U)
diff --git a/node/Constants.hpp b/node/Constants.hpp
index e4d197f41..3a329b0db 100644
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -111,8 +111,6 @@
 #include <mmintrin.h>
 #endif
 
-
-
 #if (defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(ZT_ARCH_ARM_HAS_NEON))
 #if (defined(__APPLE__) && !defined(__LP64__)) || (defined(__ANDROID__) && defined(__arm__))
 #ifdef ZT_ARCH_ARM_HAS_NEON