From d31b3a08db7e465bc1d7a5d6ae1a01a03bf78634 Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Wed, 3 Sep 2025 10:08:16 -0700
Subject: [PATCH] set ZT_AES_NEON for arm64

---
 CMakeLists.txt                              | 4 ++--
 nonfree/controller/BigTableStatusWriter.cpp | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbf29b9db..681490d30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ if(CPU_ARCHITECTURE STREQUAL "x86_64")
         -DZT_USE_FAST_X64_ED25519=1
     )
 elseif(CPU_ARCHITECTURE STREQUAL "aarch64")
-    add_definitions(-DZT_ARCHITECTURE=4 -DZT_ARCH_ARM_HAS_NEON=1 -DZT_SSO_SUPPORTED=1)
+    add_definitions(-DZT_ARCHITECTURE=4 -DZT_ARCH_ARM_HAS_NEON=1 -DZT_SSO_SUPPORTED=1 -DZT_AES_NEON=1)
     add_compile_options(-march=armv8-a+crypto -mtune=generic -mstrict-align)
 endif()
 
@@ -132,4 +132,4 @@ target_link_libraries(zerotier-selftest
     Threads::Threads
     nlohmann_json::nlohmann_json 
     prometheus-cpp-lite
-    Threads::Threads)
\ No newline at end of file
+    Threads::Threads)
diff --git a/nonfree/controller/BigTableStatusWriter.cpp b/nonfree/controller/BigTableStatusWriter.cpp
index 4406b2884..108090cab 100644
--- a/nonfree/controller/BigTableStatusWriter.cpp
+++ b/nonfree/controller/BigTableStatusWriter.cpp
@@ -1,5 +1,7 @@
 #include "BigTableStatusWriter.hpp"
 
+#include "ControllerConfig.hpp"
+
 #include <google/cloud/bigtable/mutations.h>
 #include <google/cloud/bigtable/row.h>
 #include <google/cloud/bigtable/table.h>