new import

open-quantum-safe · Mar 4, 2024 · 3f239ff · 3f239ff
1 parent d8c7641
commit 3f239ff
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 1,761 deletions.
diff --git a/docs/algorithms/sig/mayo.md b/docs/algorithms/sig/mayo.md
@@ -6,7 +6,7 @@
 - **Authors' website**: https://pqmayo.org
 - **Specification version**: 1.1.
 - **Primary Source**<a name="primary-source"></a>:
-  - **Source**: https://github.com/PQCMayo/MAYO-C/commit/5002c0c1772b7ea7eb75da14d8b12c42903f5fda with copy_from_upstream patches
+  - **Source**: https://github.com/PQCMayo/MAYO-C/commit/4694f8b2b3002d6a987a7f7323cd01a44bdc7225 with copy_from_upstream patches
   - **Implementation license (SPDX-Identifier)**: Apache-2.0
 
 

diff --git a/docs/algorithms/sig/mayo.yml b/docs/algorithms/sig/mayo.yml
@@ -11,7 +11,7 @@ website: https://pqmayo.org
 nist-round: 1
 spec-version: 1.1
 primary-upstream:
-  source: https://github.com/PQCMayo/MAYO-C/commit/5002c0c1772b7ea7eb75da14d8b12c42903f5fda
+  source: https://github.com/PQCMayo/MAYO-C/commit/4694f8b2b3002d6a987a7f7323cd01a44bdc7225
     with copy_from_upstream patches
   spdx-license-identifier: Apache-2.0
 parameter-sets:

diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml
@@ -57,7 +57,7 @@ upstreams:
     name: pqmayo
     git_url: https://github.com/PQCMayo/MAYO-C.git
     git_branch: bhe-liboqs-integration
-    git_commit: 5002c0c1772b7ea7eb75da14d8b12c42903f5fda
+    git_commit: 4694f8b2b3002d6a987a7f7323cd01a44bdc7225
     sig_meta_path: 'META/{pretty_name_full}_META.yml'
     sig_scheme_path: '.'
     patches: [pqmayo-aes.patch, pqmayo-mem.patch]

diff --git a/src/sig/mayo/CMakeLists.txt b/src/sig/mayo/CMakeLists.txt
@@ -6,7 +6,7 @@
 set(_MAYO_OBJS "")
 
 if(OQS_ENABLE_SIG_mayo_1)
-    add_library(mayo_1_opt OBJECT sig_mayo_1.c pqmayo_mayo_1_opt/aes128ctr.c pqmayo_mayo_1_opt/api.c pqmayo_mayo_1_opt/arithmetic.c pqmayo_mayo_1_opt/mayo.c pqmayo_mayo_1_opt/params.c)
+    add_library(mayo_1_opt OBJECT sig_mayo_1.c pqmayo_mayo_1_opt/api.c pqmayo_mayo_1_opt/arithmetic.c pqmayo_mayo_1_opt/mayo.c pqmayo_mayo_1_opt/params.c)
     target_compile_options(mayo_1_opt PUBLIC -DMAYO_VARIANT=MAYO_1 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL)
     target_include_directories(mayo_1_opt PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo_1_opt)
     target_include_directories(mayo_1_opt PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
@@ -15,7 +15,7 @@ if(OQS_ENABLE_SIG_mayo_1)
 endif()
 
 if(OQS_ENABLE_SIG_mayo_1_avx2)
-    add_library(mayo_1_avx2 OBJECT pqmayo_mayo_1_avx2/aes128ctr.c pqmayo_mayo_1_avx2/api.c pqmayo_mayo_1_avx2/arithmetic.c pqmayo_mayo_1_avx2/mayo.c pqmayo_mayo_1_avx2/params.c)
+    add_library(mayo_1_avx2 OBJECT pqmayo_mayo_1_avx2/api.c pqmayo_mayo_1_avx2/arithmetic.c pqmayo_mayo_1_avx2/mayo.c pqmayo_mayo_1_avx2/params.c)
     target_include_directories(mayo_1_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo_1_avx2)
     target_include_directories(mayo_1_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(mayo_1_avx2 PRIVATE -mavx2)
@@ -24,7 +24,7 @@ if(OQS_ENABLE_SIG_mayo_1_avx2)
 endif()
 
 if(OQS_ENABLE_SIG_mayo_2)
-    add_library(mayo_2_opt OBJECT sig_mayo_2.c pqmayo_mayo_2_opt/aes128ctr.c pqmayo_mayo_2_opt/api.c pqmayo_mayo_2_opt/arithmetic.c pqmayo_mayo_2_opt/mayo.c pqmayo_mayo_2_opt/params.c)
+    add_library(mayo_2_opt OBJECT sig_mayo_2.c pqmayo_mayo_2_opt/api.c pqmayo_mayo_2_opt/arithmetic.c pqmayo_mayo_2_opt/mayo.c pqmayo_mayo_2_opt/params.c)
     target_compile_options(mayo_2_opt PUBLIC -DMAYO_VARIANT=MAYO_2 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL)
     target_include_directories(mayo_2_opt PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo_2_opt)
     target_include_directories(mayo_2_opt PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
@@ -33,7 +33,7 @@ if(OQS_ENABLE_SIG_mayo_2)
 endif()
 
 if(OQS_ENABLE_SIG_mayo_2_avx2)
-    add_library(mayo_2_avx2 OBJECT pqmayo_mayo_2_avx2/aes128ctr.c pqmayo_mayo_2_avx2/api.c pqmayo_mayo_2_avx2/arithmetic.c pqmayo_mayo_2_avx2/mayo.c pqmayo_mayo_2_avx2/params.c)
+    add_library(mayo_2_avx2 OBJECT pqmayo_mayo_2_avx2/api.c pqmayo_mayo_2_avx2/arithmetic.c pqmayo_mayo_2_avx2/mayo.c pqmayo_mayo_2_avx2/params.c)
     target_include_directories(mayo_2_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo_2_avx2)
     target_include_directories(mayo_2_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(mayo_2_avx2 PRIVATE -mavx2)
@@ -42,7 +42,7 @@ if(OQS_ENABLE_SIG_mayo_2_avx2)
 endif()
 
 if(OQS_ENABLE_SIG_mayo_3)
-    add_library(mayo_3_opt OBJECT sig_mayo_3.c pqmayo_mayo_3_opt/aes128ctr.c pqmayo_mayo_3_opt/api.c pqmayo_mayo_3_opt/arithmetic.c pqmayo_mayo_3_opt/mayo.c pqmayo_mayo_3_opt/params.c)
+    add_library(mayo_3_opt OBJECT sig_mayo_3.c pqmayo_mayo_3_opt/api.c pqmayo_mayo_3_opt/arithmetic.c pqmayo_mayo_3_opt/mayo.c pqmayo_mayo_3_opt/params.c)
     target_compile_options(mayo_3_opt PUBLIC -DMAYO_VARIANT=MAYO_3 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT)
     target_include_directories(mayo_3_opt PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo_3_opt)
     target_include_directories(mayo_3_opt PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
@@ -51,7 +51,7 @@ if(OQS_ENABLE_SIG_mayo_3)
 endif()
 
 if(OQS_ENABLE_SIG_mayo_3_avx2)
-    add_library(mayo_3_avx2 OBJECT pqmayo_mayo_3_avx2/aes128ctr.c pqmayo_mayo_3_avx2/api.c pqmayo_mayo_3_avx2/arithmetic.c pqmayo_mayo_3_avx2/mayo.c pqmayo_mayo_3_avx2/params.c)
+    add_library(mayo_3_avx2 OBJECT pqmayo_mayo_3_avx2/api.c pqmayo_mayo_3_avx2/arithmetic.c pqmayo_mayo_3_avx2/mayo.c pqmayo_mayo_3_avx2/params.c)
     target_include_directories(mayo_3_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo_3_avx2)
     target_include_directories(mayo_3_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
     target_compile_options(mayo_3_avx2 PRIVATE -mavx2)

diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/aes128ctr.c b/src/sig/mayo/pqmayo_mayo_1_avx2/aes128ctr.c