Updates towards round 2.

Co-authored-by: Ward Beullens <ward@beullens.com> Co-authored-by: Fabio Campos <campos@sopmac.de> Co-authored-by: Sofía Celi <sceli@brave.com> Co-authored-by: Basil Hess <bhe@zurich.ibm.com> Co-authored-by: Matthias J. Kannwischer <matthias@kannwischer.eu>
PQCMayo · Jan 7, 2025 · e519b45 · e519b45
1 parent f2aab8a
commit e519b45
Show file tree

Hide file tree

Showing 63 changed files with 3,861 additions and 6,676 deletions.
diff --git a/.github/workflows/ci_clang.yml b/.github/workflows/ci_clang.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
         matrix:
           clang_config: [CTOS, CTO0, CTO2, CTO3, CTOSNOVEC, CTO0NOVEC, CTO2NOVEC, CTO3NOVEC]
-          # TODO: valgrind seems buggy with CT01 and CT01NOVEC
+          # Note: valgrind seems buggy with CT01 and CT01NOVEC, we skip them
           clang_version: [clang, clang-15, clang-18]
           mayo_build_type: [ref, opt, avx2]
 
@@ -42,20 +42,20 @@ jobs:
         run: |
             ldd --version
             rm -rf build && mkdir build && cd build && cmake -DENABLE_CT_TESTING=ON -DMAYO_BUILD_TYPE=${{ matrix.mayo_build_type }} -DCMAKE_C_COMPILER=${{ matrix.clang_version }} -DCMAKE_BUILD_TYPE=${{ matrix.clang_config }} -DMAYO_MARCH="-march=haswell -maes" .. && make -j
-            valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme_MAYO_1
-            valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme_MAYO_2
-            valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme_MAYO_3
-            valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme_MAYO_5
+            valgrind --max-stackframe=3190968 --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme_MAYO_1
+            valgrind --max-stackframe=3190968 --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme_MAYO_2
+            valgrind --max-stackframe=3190968 --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme_MAYO_3
+            valgrind --max-stackframe=3190968 --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme_MAYO_5
             cd ..
         if: (matrix.mayo_build_type == 'opt' || matrix.mayo_build_type == 'avx2') && !(matrix.clang_config == 'CTO3' && matrix.mayo_build_type == 'opt')
 
       - name: CT-Test (clang)
         run: |
             ldd --version
             rm -rf build && mkdir build && cd build && cmake -DENABLE_CT_TESTING=ON -DMAYO_BUILD_TYPE=${{ matrix.mayo_build_type }} -DCMAKE_C_COMPILER=${{ matrix.clang_version }} -DCMAKE_BUILD_TYPE=${{ matrix.clang_config }} -DMAYO_MARCH="-march=haswell -maes" .. && make -j
-            valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme MAYO-1
-            valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme MAYO-2
-            valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme MAYO-3
-            valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme MAYO-5
+            valgrind --max-stackframe=3190968 --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme MAYO-1
+            valgrind --max-stackframe=3190968 --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme MAYO-2
+            valgrind --max-stackframe=3190968 --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme MAYO-3
+            valgrind --max-stackframe=3190968 --tool=memcheck --error-exitcode=1 --track-origins=yes test/mayo_test_scheme MAYO-5
             cd ..
         if: matrix.mayo_build_type == 'ref'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(MAYO VERSION 1.0 LANGUAGES C CXX ASM)
 
 set(MAYO_SO_VERSION "0")
 set(CMAKE_C_STANDARD 99)
 
+set(MEMORYCHECK_COMMAND_OPTIONS "--error-exitcode=1")
 include(CTest)
 
 option(ENABLE_STRICT "Build with strict compile options." ON)

diff --git a/KAT/PQCsignKAT_24_MAYO_1.rsp b/KAT/PQCsignKAT_24_MAYO_1.rsp
diff --git a/KAT/PQCsignKAT_24_MAYO_2.rsp b/KAT/PQCsignKAT_24_MAYO_2.rsp
diff --git a/KAT/PQCsignKAT_32_MAYO_3.rsp b/KAT/PQCsignKAT_32_MAYO_3.rsp
diff --git a/KAT/PQCsignKAT_40_MAYO_5.rsp b/KAT/PQCsignKAT_40_MAYO_5.rsp
diff --git a/META/MAYO-1_META.yml b/META/MAYO-1_META.yml
@@ -1,10 +1,10 @@
 name: MAYO-1
 type: signature
 claimed-nist-level: 1
-length-public-key: 1168
+length-public-key: 1420
 length-secret-key: 24
-length-signature: 321
-nistkat-sha256: ba2473dedd92cf3b8a1fc14fc22f2ffdde972c8b64cfcd8cddb4f803e48df017
+length-signature: 454
+nistkat-sha256: 178adb997203ae0512b1bd6fa4a5cfae25805d88aeb0ce5226981423153418ee
 principal-submitters:
   - Ward Beullens
   - Fabio Campos
@@ -13,25 +13,40 @@ principal-submitters:
   - Matthias J. Kannwischer
 implementations:
   - name: opt
-    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
     folder_name: .
     compile_opts: -DMAYO_VARIANT=MAYO_1 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL
     signature_keypair: pqmayo_MAYO_1_opt_crypto_sign_keypair
     signature_signature: pqmayo_MAYO_1_opt_crypto_sign_signature
     signature_verify: pqmayo_MAYO_1_opt_crypto_sign_verify
-    sources: LICENSE NOTICE ./src/arithmetic.c ./src/mayo_1/api.c ./src/params.c ./src/mayo.c ./include/mayo.h ./include/mem.h ./src/mayo_1/api.h ./src/simple_arithmetic.h ./src/generic/arithmetic_common.h ./src/generic/echelon_form.h ./src/generic/arithmetic_96.h ./src/generic/arithmetic_64.h ./src/generic/arithmetic_128.h ./src/arithmetic.h ./src/common/aes_ctr.h
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/generic/arithmetic_dynamic.h ./src/generic/arithmetic_fixed.h ./src/generic/echelon_form.h ./src/generic/ef_inner_loop.h ./src/generic/generic_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_1/api.h ./src/mayo_1/api.c
   - name: avx2
-    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
     folder_name: .
     compile_opts: -DMAYO_VARIANT=MAYO_1 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL
     signature_keypair: pqmayo_MAYO_1_avx2_crypto_sign_keypair
     signature_signature: pqmayo_MAYO_1_avx2_crypto_sign_signature
     signature_verify: pqmayo_MAYO_1_avx2_crypto_sign_verify
-    sources: LICENSE NOTICE ./src/arithmetic.c ./src/mayo_1/api.c ./src/params.c ./src/mayo.c ./include/mayo.h ./include/mem.h ./src/mayo_1/api.h ./src/simple_arithmetic.h ./src/arithmetic.h ./src/common/aes_ctr.h ./src/AVX2/arithmetic_128.h ./src/AVX2/arithmetic_96.h ./src/AVX2/echelon_form.h ./src/AVX2/shuffle_arithmetic_128.h ./src/AVX2/shuffle_arithmetic_96.h ./src/AVX2/arithmetic_64.h ./src/AVX2/arithmetic_common.h ./src/AVX2/echelon_form_loop.h ./src/AVX2/shuffle_arithmetic_64.h
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/AVX2/arithmetic_common.h ./src/AVX2/echelon_form.h ./src/AVX2/echelon_form_loop.h ./src/AVX2/shuffle_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_1/api.h ./src/mayo_1/api.c
     supported_platforms:
       - architecture: x86_64
         operating_systems:
           - Darwin
           - Linux
         required_flags:
           - avx2
+  - name: neon
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
+    folder_name: .
+    compile_opts: -DMAYO_VARIANT=MAYO_1 -DMAYO_BUILD_TYPE_NEON -DMAYO_NEON -DHAVE_RANDOMBYTES_NORETVAL
+    signature_keypair: pqmayo_MAYO_1_neon_crypto_sign_keypair
+    signature_signature: pqmayo_MAYO_1_neon_crypto_sign_signature
+    signature_verify: pqmayo_MAYO_1_neon_crypto_sign_verify
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/neon/arithmetic_common.h ./src/neon/echelon_form.h ./src/neon/echelon_form_loop.h ./src/neon/shuffle_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_1/api.h ./src/mayo_1/api.c
+    supported_platforms:
+      - architecture: arm_8
+        operating_systems:
+          - Darwin
+          - Linux
+        required_flags:
+          - asimd
diff --git a/META/MAYO-2_META.yml b/META/MAYO-2_META.yml
@@ -1,10 +1,10 @@
 name: MAYO-2
 type: signature
 claimed-nist-level: 1
-length-public-key: 5488
+length-public-key: 4912
 length-secret-key: 24
-length-signature: 180
-nistkat-sha256: 72cb237642b2c0c4e7f8c824d9c8601ac7189784649d28dbb2cccfb94732c9a3
+length-signature: 186
+nistkat-sha256: 777df9b41af1a58536ef76d483775b5c8389ff991e70652fa3af803770a5fce3
 principal-submitters:
   - Ward Beullens
   - Fabio Campos
@@ -13,25 +13,40 @@ principal-submitters:
   - Matthias J. Kannwischer
 implementations:
   - name: opt
-    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
     folder_name: .
     compile_opts: -DMAYO_VARIANT=MAYO_2 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL
     signature_keypair: pqmayo_MAYO_2_opt_crypto_sign_keypair
     signature_signature: pqmayo_MAYO_2_opt_crypto_sign_signature
     signature_verify: pqmayo_MAYO_2_opt_crypto_sign_verify
-    sources: LICENSE NOTICE ./src/arithmetic.c ./src/mayo_2/api.c ./src/params.c ./src/mayo.c ./include/mayo.h ./include/mem.h ./src/mayo_2/api.h ./src/simple_arithmetic.h ./src/generic/arithmetic_common.h ./src/generic/echelon_form.h ./src/generic/arithmetic_96.h ./src/generic/arithmetic_64.h ./src/generic/arithmetic_128.h ./src/arithmetic.h ./src/common/aes_ctr.h
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/generic/arithmetic_dynamic.h ./src/generic/arithmetic_fixed.h ./src/generic/echelon_form.h ./src/generic/ef_inner_loop.h ./src/generic/generic_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_2/api.h ./src/mayo_2/api.c
   - name: avx2
-    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
     folder_name: .
     compile_opts: -DMAYO_VARIANT=MAYO_2 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL
     signature_keypair: pqmayo_MAYO_2_avx2_crypto_sign_keypair
     signature_signature: pqmayo_MAYO_2_avx2_crypto_sign_signature
     signature_verify: pqmayo_MAYO_2_avx2_crypto_sign_verify
-    sources: LICENSE NOTICE ./src/arithmetic.c ./src/mayo_2/api.c ./src/params.c ./src/mayo.c ./include/mayo.h ./include/mem.h ./src/mayo_2/api.h ./src/simple_arithmetic.h ./src/arithmetic.h ./src/common/aes_ctr.h ./src/AVX2/arithmetic_128.h ./src/AVX2/arithmetic_96.h ./src/AVX2/echelon_form.h ./src/AVX2/shuffle_arithmetic_128.h ./src/AVX2/shuffle_arithmetic_96.h ./src/AVX2/arithmetic_64.h ./src/AVX2/arithmetic_common.h ./src/AVX2/echelon_form_loop.h ./src/AVX2/shuffle_arithmetic_64.h
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/AVX2/arithmetic_common.h ./src/AVX2/echelon_form.h ./src/AVX2/echelon_form_loop.h ./src/AVX2/shuffle_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_2/api.h ./src/mayo_2/api.c
     supported_platforms:
       - architecture: x86_64
         operating_systems:
           - Darwin
           - Linux
         required_flags:
           - avx2
+  - name: neon
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
+    folder_name: .
+    compile_opts: -DMAYO_VARIANT=MAYO_2 -DMAYO_BUILD_TYPE_NEON -DMAYO_NEON -DHAVE_RANDOMBYTES_NORETVAL
+    signature_keypair: pqmayo_MAYO_2_neon_crypto_sign_keypair
+    signature_signature: pqmayo_MAYO_2_neon_crypto_sign_signature
+    signature_verify: pqmayo_MAYO_2_neon_crypto_sign_verify
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/neon/arithmetic_common.h ./src/neon/echelon_form.h ./src/neon/echelon_form_loop.h ./src/neon/shuffle_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_2/api.h ./src/mayo_2/api.c
+    supported_platforms:
+      - architecture: arm_8
+        operating_systems:
+          - Darwin
+          - Linux
+        required_flags:
+          - asimd
diff --git a/META/MAYO-3_META.yml b/META/MAYO-3_META.yml
@@ -1,10 +1,10 @@
 name: MAYO-3
 type: signature
 claimed-nist-level: 3
-length-public-key: 2656
+length-public-key: 2986
 length-secret-key: 32
-length-signature: 577
-nistkat-sha256: dbc49f4fdfa0de69d416051215cb53c042c4a329d325452d079f3734b7467a6b
+length-signature: 681
+nistkat-sha256: af940f5cd678bde08f452d3ee7e831ec1a2269715579c604ae699069b6fd9c15
 principal-submitters:
   - Ward Beullens
   - Fabio Campos
@@ -13,25 +13,40 @@ principal-submitters:
   - Matthias J. Kannwischer
 implementations:
   - name: opt
-    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
     folder_name: .
-    compile_opts: -DMAYO_VARIANT=MAYO_3 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT
+    compile_opts: -DMAYO_VARIANT=MAYO_3 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL
     signature_keypair: pqmayo_MAYO_3_opt_crypto_sign_keypair
     signature_signature: pqmayo_MAYO_3_opt_crypto_sign_signature
     signature_verify: pqmayo_MAYO_3_opt_crypto_sign_verify
-    sources: LICENSE NOTICE ./src/arithmetic.c ./src/mayo_3/api.c ./src/params.c ./src/mayo.c ./include/mayo.h ./include/mem.h ./src/mayo_3/api.h ./src/simple_arithmetic.h ./src/generic/arithmetic_common.h ./src/generic/echelon_form.h ./src/generic/arithmetic_96.h ./src/generic/arithmetic_64.h ./src/generic/arithmetic_128.h ./src/arithmetic.h ./src/common/aes_ctr.h
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/generic/arithmetic_dynamic.h ./src/generic/arithmetic_fixed.h ./src/generic/echelon_form.h ./src/generic/ef_inner_loop.h ./src/generic/generic_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_3/api.h ./src/mayo_3/api.c
   - name: avx2
-    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
     folder_name: .
-    compile_opts: -DMAYO_VARIANT=MAYO_3 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT
+    compile_opts: -DMAYO_VARIANT=MAYO_3 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL
     signature_keypair: pqmayo_MAYO_3_avx2_crypto_sign_keypair
     signature_signature: pqmayo_MAYO_3_avx2_crypto_sign_signature
     signature_verify: pqmayo_MAYO_3_avx2_crypto_sign_verify
-    sources: LICENSE NOTICE ./src/arithmetic.c ./src/mayo_3/api.c ./src/params.c ./src/mayo.c ./include/mayo.h ./include/mem.h ./src/mayo_3/api.h ./src/simple_arithmetic.h ./src/arithmetic.h ./src/common/aes_ctr.h ./src/AVX2/arithmetic_128.h ./src/AVX2/arithmetic_96.h ./src/AVX2/echelon_form.h ./src/AVX2/shuffle_arithmetic_128.h ./src/AVX2/shuffle_arithmetic_96.h ./src/AVX2/arithmetic_64.h ./src/AVX2/arithmetic_common.h ./src/AVX2/echelon_form_loop.h ./src/AVX2/shuffle_arithmetic_64.h
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/AVX2/arithmetic_common.h ./src/AVX2/echelon_form.h ./src/AVX2/echelon_form_loop.h ./src/AVX2/shuffle_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_3/api.h ./src/mayo_3/api.c
     supported_platforms:
       - architecture: x86_64
         operating_systems:
           - Darwin
           - Linux
         required_flags:
           - avx2
+  - name: neon
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
+    folder_name: .
+    compile_opts: -DMAYO_VARIANT=MAYO_3 -DMAYO_BUILD_TYPE_NEON -DMAYO_NEON -DHAVE_RANDOMBYTES_NORETVAL
+    signature_keypair: pqmayo_MAYO_3_neon_crypto_sign_keypair
+    signature_signature: pqmayo_MAYO_3_neon_crypto_sign_signature
+    signature_verify: pqmayo_MAYO_3_neon_crypto_sign_verify
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/neon/arithmetic_common.h ./src/neon/echelon_form.h ./src/neon/echelon_form_loop.h ./src/neon/shuffle_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_3/api.h ./src/mayo_3/api.c
+    supported_platforms:
+      - architecture: arm_8
+        operating_systems:
+          - Darwin
+          - Linux
+        required_flags:
+          - asimd
diff --git a/META/MAYO-5_META.yml b/META/MAYO-5_META.yml
@@ -1,10 +1,10 @@
 name: MAYO-5
 type: signature
 claimed-nist-level: 5
-length-public-key: 5008
+length-public-key: 5554
 length-secret-key: 40
-length-signature: 838
-nistkat-sha256: f2c1c69045c7d15e714a04119965e8a7007ef54f9293158587560227c97b237d
+length-signature: 964
+nistkat-sha256: 9a2ede41913131ab479c2581a1a8e86b97222d800aeb16bf67f6163481f2d587
 principal-submitters:
   - Ward Beullens
   - Fabio Campos
@@ -13,25 +13,40 @@ principal-submitters:
   - Matthias J. Kannwischer
 implementations:
   - name: opt
-    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
     folder_name: .
-    compile_opts: -DMAYO_VARIANT=MAYO_5 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT
+    compile_opts: -DMAYO_VARIANT=MAYO_5 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL
     signature_keypair: pqmayo_MAYO_5_opt_crypto_sign_keypair
     signature_signature: pqmayo_MAYO_5_opt_crypto_sign_signature
     signature_verify: pqmayo_MAYO_5_opt_crypto_sign_verify
-    sources: LICENSE NOTICE ./src/arithmetic.c ./src/mayo_5/api.c ./src/params.c ./src/mayo.c ./include/mayo.h ./include/mem.h ./src/mayo_5/api.h ./src/simple_arithmetic.h ./src/generic/arithmetic_common.h ./src/generic/echelon_form.h ./src/generic/arithmetic_96.h ./src/generic/arithmetic_64.h ./src/generic/arithmetic_128.h ./src/arithmetic.h ./src/common/aes_ctr.h
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/generic/arithmetic_dynamic.h ./src/generic/arithmetic_fixed.h ./src/generic/echelon_form.h ./src/generic/ef_inner_loop.h ./src/generic/generic_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_5/api.h ./src/mayo_5/api.c
   - name: avx2
-    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
     folder_name: .
-    compile_opts: -DMAYO_VARIANT=MAYO_5 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT
+    compile_opts: -DMAYO_VARIANT=MAYO_5 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL
     signature_keypair: pqmayo_MAYO_5_avx2_crypto_sign_keypair
     signature_signature: pqmayo_MAYO_5_avx2_crypto_sign_signature
     signature_verify: pqmayo_MAYO_5_avx2_crypto_sign_verify
-    sources: LICENSE NOTICE ./src/arithmetic.c ./src/mayo_5/api.c ./src/params.c ./src/mayo.c ./include/mayo.h ./include/mem.h ./src/mayo_5/api.h ./src/simple_arithmetic.h ./src/arithmetic.h ./src/common/aes_ctr.h ./src/AVX2/arithmetic_128.h ./src/AVX2/arithmetic_96.h ./src/AVX2/echelon_form.h ./src/AVX2/shuffle_arithmetic_128.h ./src/AVX2/shuffle_arithmetic_96.h ./src/AVX2/arithmetic_64.h ./src/AVX2/arithmetic_common.h ./src/AVX2/echelon_form_loop.h ./src/AVX2/shuffle_arithmetic_64.h
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/AVX2/arithmetic_common.h ./src/AVX2/echelon_form.h ./src/AVX2/echelon_form_loop.h ./src/AVX2/shuffle_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_5/api.h ./src/mayo_5/api.c
     supported_platforms:
       - architecture: x86_64
         operating_systems:
           - Darwin
           - Linux
         required_flags:
           - avx2
+  - name: neon
+    version: https://github.com/PQCMayo/MAYO-C/tree/nibbling-mayo-round2
+    folder_name: .
+    compile_opts: -DMAYO_VARIANT=MAYO_5 -DMAYO_BUILD_TYPE_NEON -DMAYO_NEON -DHAVE_RANDOMBYTES_NORETVAL
+    signature_keypair: pqmayo_MAYO_5_neon_crypto_sign_keypair
+    signature_signature: pqmayo_MAYO_5_neon_crypto_sign_signature
+    signature_verify: pqmayo_MAYO_5_neon_crypto_sign_verify
+    sources: LICENSE NOTICE ./src/arithmetic.c ./src/arithmetic.h ./src/mayo.c ./src/params.c ./src/simple_arithmetic.h ./src/neon/arithmetic_common.h ./src/neon/echelon_form.h ./src/neon/echelon_form_loop.h ./src/neon/shuffle_arithmetic.h ./include/mayo.h ./include/mem.h ./src/common/aes_ctr.h ./src/mayo_5/api.h ./src/mayo_5/api.c
+    supported_platforms:
+      - architecture: arm_8
+        operating_systems:
+          - Darwin
+          - Linux
+        required_flags:
+          - asimd