Riscv zephyr support

CMakeLists.txt

@@ -87,6 +87,8 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
     if(${OQS_DIST_BUILD})
         set(OQS_DIST_S390X_BUILD ON)
     endif()
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv")
+    set(ARCH "riscv")
 elseif(OQS_PERMIT_UNSUPPORTED_ARCHITECTURE)
     message(WARNING "Unknown or unsupported processor: " ${CMAKE_SYSTEM_PROCESSOR})
     message(WARNING "Compilation on an unsupported processor should only be used for testing, as it may result an insecure configuration, for example due to variable-time instructions leaking secret information.")

PLATFORMS.md

@@ -54,6 +54,7 @@ In this policy, the words "must" and "must not" specify absolute requirements th
 - x86_64/amd64/x64 for Windows 2022
 - armeabi-v7a, arm64-v8a, x86, x86_64 for Android
 - aarch64 for Apple iOS and tvOS (CMake `-DPLATFORM=OS64` and `TVOS`)
+- riscv32, riscv64 for Zephyr
 
 ### Tier 3
 

zephyr/CMakeLists.txt

@@ -2,6 +2,7 @@
 
 # Only add liboqs Zephyr module if enabled in Kconfig
 if(CONFIG_LIBOQS)
+
         # Workarounds for Zephyr
         if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
                 # We have to set that manually as CMake can't detect it properly in Zephyr
@@ -10,9 +11,24 @@ if(CONFIG_LIBOQS)
                 # Workaround as the generic name "arm" is not a supported architecture in liboqs.
                 # In Zephyr, however, it is exclusively used for 32-bit ARM architectures.
                 set(CMAKE_SYSTEM_PROCESSOR "armv7")
-
                 # We have to set that manually as CMake can't detect it properly in Zephyr
                 set(CMAKE_SIZEOF_VOID_P 4)
+        elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv")
+                if(BOARD MATCHES "qemu_riscv32")
+                        set(CMAKE_SYSTEM_PROCESSOR "riscv32")
+                        # We have to set that manually as CMake can't detect it properly in Zephyr
+                        set(CMAKE_SIZEOF_VOID_P 4)
+                elseif(BOARD MATCHES "hifive1_revb")
+                        set(CMAKE_SYSTEM_PROCESSOR "riscv32")
+                        # We have to set that manually as CMake can't detect it properly in Zephyr
+                        set(CMAKE_SIZEOF_VOID_P 4)
+                elseif(BOARD MATCHES "qemu_riscv64")
+                        set(CMAKE_SYSTEM_PROCESSOR "riscv64")
+                        # We have to set that manually as CMake can't detect it properly in Zephyr
+                        set(CMAKE_SIZEOF_VOID_P 8)
+                else()
+                        message(FATAL_ERROR "Unsupported board ${BOARD} with riscv architecture")
+                endif()
         elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "posix")
                 # Workaround to enable the native Zephyr builds on the Linux host system.
                 if(BOARD MATCHES "native_posix|native_sim")

zephyr/Kconfig

@@ -2,10 +2,10 @@
 
 config LIBOQS
 	bool "Enable liboqs"
-	depends on ARM || ARM64 || X86 || ARCH_POSIX
+	depends on ARM || ARM64 || X86 || ARCH_POSIX || RISCV
 	help
 	  This option enables the liboqs as a Zephyr module. Currenty, the port is only
-	  available for ARM, ARM64, and x86 architectures and the native Posix simulators.
+	  available for ARM, ARM64, x86, RISCV-32, and RISCV-64 architectures and the native Posix simulators.
 
 menu "Liboqs algorithm configuration"
 

zephyr/samples/KEMs/sample.yaml

@@ -14,3 +14,5 @@ tests:
     integration_platforms:
       - qemu_x86
       - qemu_cortex_a53
+      - qemu_riscv32
+      - qemu_riscv64

zephyr/samples/Signatures/sample.yaml

@@ -14,3 +14,5 @@ tests:
     integration_platforms:
       - qemu_x86
       - qemu_cortex_a53
+      - qemu_riscv32
+      - qemu_riscv64