ci

ladnir · Oct 25, 2024 · 49cded4 · 49cded4
1 parent bd00248
commit 49cded4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/cmake/cryptoToolsBuildOptions.cmake b/cmake/cryptoToolsBuildOptions.cmake
@@ -24,7 +24,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
 	set(ENABLE_SSE_DEFAULT false)
 else()
     # Code for other architectures
-    message(STATUS "Not building for x86-64")
+    message(STATUS "Building for x86-64")
 	set(ENABLE_ARM_AES_DEFAULT false)
 	set(ENABLE_SSE_DEFAULT true)
 endif()
@@ -139,6 +139,7 @@ message(STATUS "Option: ENABLE_OPENSSL    = ${ENABLE_OPENSSL}")
 message(STATUS "Option: ENABLE_COPROTO    = ${ENABLE_COPROTO}")
 message(STATUS "Option: ENABLE_CIRCUITS   = ${ENABLE_CIRCUITS}")
 
+message(STATUS "Option: ENABLE_ARM_AES    = ${ENABLE_ARM_AES}")
 message(STATUS "Option: ENABLE_SSE        = ${ENABLE_SSE}")
 message(STATUS "Option: ENABLE_AVX        = ${ENABLE_AVX}")
 message(STATUS "Option: ENABLE_PIC        = ${ENABLE_PIC}")

diff --git a/cryptoTools/CMakeLists.txt b/cryptoTools/CMakeLists.txt
@@ -56,6 +56,8 @@ else()
 endif()
 
 
+target_link_libraries(cryptoTools libdivide)
+
 ## span-lite
 ###########################################################################
 

diff --git a/cryptoTools/Crypto/AES.cpp b/cryptoTools/Crypto/AES.cpp
@@ -4,7 +4,7 @@
 
 #ifdef OC_ENABLE_AESNI
 #include <wmmintrin.h>
-#elif !defined(OC_ENABLE_PORTABLE_AES)
+#elif !defined(OC_ENABLE_PORTABLE_AES) && !defined(ENABLE_ARM_AES)
 static_assert(0, "OC_ENABLE_PORTABLE_AES must be defined if ENABLE_AESNI is not.");
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,8 @@ else() @@
     endif()
+    target_link_libraries(cryptoTools libdivide)
     ## span-lite
     ###########################################################################
@@ Expand Down @@