Android build fixes

Yubico · Apr 27, 2022 · f49b254 · f49b254
1 parent c9f78b2
commit f49b254
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,6 +37,7 @@ option(BUILD_MANPAGES    "Build man pages"                         ON)
 option(BUILD_SHARED_LIBS "Build a shared library"                  ON)
 option(BUILD_STATIC_LIBS "Build a static library"                  ON)
 option(BUILD_TOOLS       "Build tool programs"                     ON)
+option(BUILD_TESTS       "Build test programs"                     ON)
 option(FUZZ              "Enable fuzzing instrumentation"          OFF)
 option(LIBFUZZER         "Build libfuzzer harnesses"               OFF)
 option(USE_HIDAPI        "Use hidapi as the HID backend"           OFF)
@@ -70,6 +71,9 @@ if(NOT MSVC)
 	elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_GNU_SOURCE")
 		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_DEFAULT_SOURCE")
+	elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_GNU_SOURCE")
+		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_DEFAULT_SOURCE")
 	elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
 	    CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD")
 		set(FIDO_CFLAGS "${FIDO_CFLAGS} -D__BSD_VISIBLE=1")
@@ -110,6 +114,11 @@ check_symbol_exists(sysconf unistd.h HAVE_SYSCONF)
 check_symbol_exists(timespecsub sys/time.h HAVE_TIMESPECSUB)
 check_symbol_exists(timingsafe_bcmp string.h HAVE_TIMINGSAFE_BCMP)
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+    set(HAVE_EXPLICIT_BZERO OFF)
+    add_definitions(-DCRYPTO_EXPLICIT_BZERO)
+endif()
+
 set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 try_compile(HAVE_POSIX_IOCTL
     "${CMAKE_CURRENT_BINARY_DIR}/posix_ioctl_check.o"
@@ -229,6 +238,23 @@ else()
 				set(BASE_LIBRARIES ${BASE_LIBRARIES} rt)
 			endif()
 		endif()
+	elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+		if(UDEV_ROOT_DIR)
+			list(PREPEND CMAKE_FIND_ROOT_PATH ${UDEV_ROOT_DIR})
+		endif()
+
+		find_path(UDEV_INCLUDE_DIR
+			NAMES "libudev.h")
+
+		find_library(UDEV_LIBRARY
+			NAMES libudev-zero.a libudev)
+
+		add_library(udev STATIC IMPORTED GLOBAL)
+		set_target_properties(udev PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${UDEV_INCLUDE_DIR}")
+		set_target_properties(udev PROPERTIES IMPORTED_LOCATION "${UDEV_LIBRARY}")
+
+		set(UDEV_INCLUDE_DIRS "${UDEV_INCLUDE_DIR}")
+		set(UDEV_LIBRARIES "udev")
 	else()
 		set(NFC_LINUX OFF)
 	endif()
@@ -436,10 +462,13 @@ else()
 	message(FATAL_ERROR "Nothing to build (BUILD_*_LIBS=OFF)")
 endif()
 
-enable_testing()
-
 subdirs(src)
-subdirs(regress)
+
+if(BUILD_TESTS)
+	enable_testing()
+	subdirs(regress)
+endif()
+
 if(BUILD_EXAMPLES)
 	subdirs(examples)
 endif()

diff --git a/openbsd-compat/explicit_bzero.c b/openbsd-compat/explicit_bzero.c
@@ -7,7 +7,7 @@
 
 #include "openbsd-compat.h"
 
-#if !defined(HAVE_EXPLICIT_BZERO) && !defined(_WIN32)
+#if !defined(HAVE_EXPLICIT_BZERO) && !defined(_WIN32) && !defined(CRYPTO_EXPLICIT_BZERO)
 
 #include <string.h>
 

diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
@@ -62,7 +62,7 @@ char *strsep(char **, const char *);
 void *recallocarray(void *, size_t, size_t, size_t);
 #endif
 
-#if !defined(HAVE_EXPLICIT_BZERO)
+#if !defined(HAVE_EXPLICIT_BZERO) || defined(CRYPTO_EXPLICIT_BZERO)
 void explicit_bzero(void *, size_t);
 #endif
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -71,6 +71,8 @@ elseif(APPLE)
 	list(APPEND FIDO_SOURCES hid_osx.c)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	list(APPEND FIDO_SOURCES hid_linux.c hid_unix.c)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+	list(APPEND FIDO_SOURCES hid_linux.c hid_unix.c)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
 	list(APPEND FIDO_SOURCES hid_netbsd.c hid_unix.c)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")