diff --git a/README.md b/README.md index 03ed6b488..b21281e2c 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ All names other than `ML-KEM` and `ML-DSA` are subject to change. `liboqs` makes - **CRYSTALS-Dilithium**: Dilithium2, Dilithium3, Dilithium5 - **Falcon**: Falcon-512, Falcon-1024, Falcon-padded-512, Falcon-padded-1024 -- **MAYO**: MAYO\_1, MAYO\_2, MAYO\_3, MAYO\_5† +- **MAYO**: MAYO-1, MAYO-2, MAYO-3, MAYO-5† - **ML-DSA**: ML-DSA-44-ipd (alias: ML-DSA-44), ML-DSA-65-ipd (alias: ML-DSA-65), ML-DSA-87-ipd (alias: ML-DSA-87) - **SPHINCS+-SHA2**: SPHINCS+-SHA2-128f-simple, SPHINCS+-SHA2-128s-simple, SPHINCS+-SHA2-192f-simple, SPHINCS+-SHA2-192s-simple, SPHINCS+-SHA2-256f-simple, SPHINCS+-SHA2-256s-simple - **SPHINCS+-SHAKE**: SPHINCS+-SHAKE-128f-simple, SPHINCS+-SHAKE-128s-simple, SPHINCS+-SHAKE-192f-simple, SPHINCS+-SHAKE-192s-simple, SPHINCS+-SHAKE-256f-simple, SPHINCS+-SHAKE-256s-simple diff --git a/docs/algorithms/sig/mayo.md b/docs/algorithms/sig/mayo.md index 1bf05fd44..162f97dfa 100644 --- a/docs/algorithms/sig/mayo.md +++ b/docs/algorithms/sig/mayo.md @@ -6,7 +6,7 @@ - **Authors' website**: https://pqmayo.org - **Specification version**: https://eprint.iacr.org/2023/1683. - **Primary Source**: - - **Source**: https://github.com/PQCMayo/MAYO-C/commit/fc9079fb5ac5cd4af98e3e0f094a0a3cf2a01499 with copy_from_upstream patches + - **Source**: https://github.com/PQCMayo/MAYO-C/commit/cde2675ff404b0ae070e7dbc3d962ea0b026a81e with copy_from_upstream patches - **Implementation license (SPDX-Identifier)**: Apache-2.0 @@ -14,12 +14,12 @@ | Parameter set | Parameter set alias | Security model | Claimed NIST Level | Public key size (bytes) | Secret key size (bytes) | Signature size (bytes) | |:---------------:|:----------------------|:-----------------|---------------------:|--------------------------:|--------------------------:|-------------------------:| -| MAYO\_1 | NA | EUF-CMA | 1 | 1168 | 24 | 321 | -| MAYO\_2 | NA | EUF-CMA | 1 | 5488 | 24 | 180 | -| MAYO\_3 | NA | EUF-CMA | 3 | 2656 | 32 | 577 | -| MAYO\_5 | NA | EUF-CMA | 5 | 5008 | 40 | 838 | +| MAYO-1 | NA | EUF-CMA | 1 | 1168 | 24 | 321 | +| MAYO-2 | NA | EUF-CMA | 1 | 5488 | 24 | 180 | +| MAYO-3 | NA | EUF-CMA | 3 | 2656 | 32 | 577 | +| MAYO-5 | NA | EUF-CMA | 5 | 5008 | 40 | 838 | -## MAYO\_1 implementation characteristics +## MAYO-1 implementation characteristics | Implementation source | Identifier in upstream | Supported architecture(s) | Supported operating system(s) | CPU extension(s) used | No branching-on-secrets claimed? | No branching-on-secrets checked by valgrind? | Large stack usage?‡ | |:---------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:----------------------| @@ -30,7 +30,7 @@ Are implementations chosen based on runtime CPU feature detection? **Yes**. ‡For an explanation of what this denotes, consult the [Explanation of Terms](#explanation-of-terms) section at the end of this file. -## MAYO\_2 implementation characteristics +## MAYO-2 implementation characteristics | Implementation source | Identifier in upstream | Supported architecture(s) | Supported operating system(s) | CPU extension(s) used | No branching-on-secrets claimed? | No branching-on-secrets checked by valgrind? | Large stack usage? | |:---------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------| @@ -39,7 +39,7 @@ Are implementations chosen based on runtime CPU feature detection? **Yes**. Are implementations chosen based on runtime CPU feature detection? **Yes**. -## MAYO\_3 implementation characteristics +## MAYO-3 implementation characteristics | Implementation source | Identifier in upstream | Supported architecture(s) | Supported operating system(s) | CPU extension(s) used | No branching-on-secrets claimed? | No branching-on-secrets checked by valgrind? | Large stack usage? | |:---------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------| @@ -48,7 +48,7 @@ Are implementations chosen based on runtime CPU feature detection? **Yes**. Are implementations chosen based on runtime CPU feature detection? **Yes**. -## MAYO\_5 implementation characteristics +## MAYO-5 implementation characteristics | Implementation source | Identifier in upstream | Supported architecture(s) | Supported operating system(s) | CPU extension(s) used | No branching-on-secrets claimed? | No branching-on-secrets checked by valgrind? | Large stack usage? | |:---------------------------------:|:-------------------------|:----------------------------|:--------------------------------|:------------------------|:-----------------------------------|:-----------------------------------------------|:---------------------| diff --git a/docs/algorithms/sig/mayo.yml b/docs/algorithms/sig/mayo.yml index 4cbd20d7f..642b7f4cf 100644 --- a/docs/algorithms/sig/mayo.yml +++ b/docs/algorithms/sig/mayo.yml @@ -11,11 +11,11 @@ website: https://pqmayo.org nist-round: 1 spec-version: https://eprint.iacr.org/2023/1683 primary-upstream: - source: https://github.com/PQCMayo/MAYO-C/commit/fc9079fb5ac5cd4af98e3e0f094a0a3cf2a01499 + source: https://github.com/PQCMayo/MAYO-C/commit/cde2675ff404b0ae070e7dbc3d962ea0b026a81e with copy_from_upstream patches spdx-license-identifier: Apache-2.0 parameter-sets: -- name: MAYO_1 +- name: MAYO-1 claimed-nist-level: 1 claimed-security: EUF-CMA length-public-key: 1168 @@ -47,7 +47,7 @@ parameter-sets: no-secret-dependent-branching-claimed: true no-secret-dependent-branching-checked-by-valgrind: true large-stack-usage: false -- name: MAYO_2 +- name: MAYO-2 claimed-nist-level: 1 claimed-security: EUF-CMA length-public-key: 5488 @@ -79,7 +79,7 @@ parameter-sets: no-secret-dependent-branching-claimed: true no-secret-dependent-branching-checked-by-valgrind: true large-stack-usage: false -- name: MAYO_3 +- name: MAYO-3 claimed-nist-level: 3 claimed-security: EUF-CMA length-public-key: 2656 @@ -110,7 +110,7 @@ parameter-sets: no-secret-dependent-branching-claimed: true no-secret-dependent-branching-checked-by-valgrind: true large-stack-usage: false -- name: MAYO_5 +- name: MAYO-5 claimed-nist-level: 5 claimed-security: EUF-CMA length-public-key: 5008 diff --git a/docs/cbom.json b/docs/cbom.json index 1b2f5fca9..358fc28b3 100644 --- a/docs/cbom.json +++ b/docs/cbom.json @@ -1,23 +1,23 @@ { "bomFormat": "CBOM", "specVersion": "1.4-cbom-1.0", - "serialNumber": "urn:uuid:dbce4160-9dc5-450c-b83c-0cb0345d7045", + "serialNumber": "urn:uuid:004d7395-7601-44af-97dd-57c2214e5f60", "version": 1, "metadata": { - "timestamp": "2024-05-24T18:35:02.761477", + "timestamp": "2024-07-11T15:22:22.228289", "component": { "type": "library", - "bom-ref": "pkg:github/open-quantum-safe/liboqs@580d494efeee25edd354eaa2e0fe6581d552b827", + "bom-ref": "pkg:github/open-quantum-safe/liboqs@ca5d956097e10672aaa9bb7994057bcc58291b65", "name": "liboqs", - "version": "580d494efeee25edd354eaa2e0fe6581d552b827" + "version": "ca5d956097e10672aaa9bb7994057bcc58291b65" } }, "components": [ { "type": "library", - "bom-ref": "pkg:github/open-quantum-safe/liboqs@580d494efeee25edd354eaa2e0fe6581d552b827", + "bom-ref": "pkg:github/open-quantum-safe/liboqs@ca5d956097e10672aaa9bb7994057bcc58291b65", "name": "liboqs", - "version": "580d494efeee25edd354eaa2e0fe6581d552b827" + "version": "ca5d956097e10672aaa9bb7994057bcc58291b65" }, { "type": "crypto-asset", @@ -1541,12 +1541,12 @@ }, { "type": "crypto-asset", - "bom-ref": "alg:MAYO_1:generic", + "bom-ref": "alg:MAYO-1:generic", "name": "MAYO", "cryptoProperties": { "assetType": "algorithm", "algorithmProperties": { - "variant": "MAYO_1", + "variant": "MAYO-1", "primitive": "signature", "implementationLevel": "softwarePlainRam", "cryptoFunctions": [ @@ -1561,12 +1561,12 @@ }, { "type": "crypto-asset", - "bom-ref": "alg:MAYO_1:x86_64", + "bom-ref": "alg:MAYO-1:x86_64", "name": "MAYO", "cryptoProperties": { "assetType": "algorithm", "algorithmProperties": { - "variant": "MAYO_1", + "variant": "MAYO-1", "primitive": "signature", "implementationLevel": "softwarePlainRam", "cryptoFunctions": [ @@ -1581,12 +1581,12 @@ }, { "type": "crypto-asset", - "bom-ref": "alg:MAYO_2:generic", + "bom-ref": "alg:MAYO-2:generic", "name": "MAYO", "cryptoProperties": { "assetType": "algorithm", "algorithmProperties": { - "variant": "MAYO_2", + "variant": "MAYO-2", "primitive": "signature", "implementationLevel": "softwarePlainRam", "cryptoFunctions": [ @@ -1601,12 +1601,12 @@ }, { "type": "crypto-asset", - "bom-ref": "alg:MAYO_2:x86_64", + "bom-ref": "alg:MAYO-2:x86_64", "name": "MAYO", "cryptoProperties": { "assetType": "algorithm", "algorithmProperties": { - "variant": "MAYO_2", + "variant": "MAYO-2", "primitive": "signature", "implementationLevel": "softwarePlainRam", "cryptoFunctions": [ @@ -1621,12 +1621,12 @@ }, { "type": "crypto-asset", - "bom-ref": "alg:MAYO_3:generic", + "bom-ref": "alg:MAYO-3:generic", "name": "MAYO", "cryptoProperties": { "assetType": "algorithm", "algorithmProperties": { - "variant": "MAYO_3", + "variant": "MAYO-3", "primitive": "signature", "implementationLevel": "softwarePlainRam", "cryptoFunctions": [ @@ -1641,12 +1641,12 @@ }, { "type": "crypto-asset", - "bom-ref": "alg:MAYO_3:x86_64", + "bom-ref": "alg:MAYO-3:x86_64", "name": "MAYO", "cryptoProperties": { "assetType": "algorithm", "algorithmProperties": { - "variant": "MAYO_3", + "variant": "MAYO-3", "primitive": "signature", "implementationLevel": "softwarePlainRam", "cryptoFunctions": [ @@ -1661,12 +1661,12 @@ }, { "type": "crypto-asset", - "bom-ref": "alg:MAYO_5:generic", + "bom-ref": "alg:MAYO-5:generic", "name": "MAYO", "cryptoProperties": { "assetType": "algorithm", "algorithmProperties": { - "variant": "MAYO_5", + "variant": "MAYO-5", "primitive": "signature", "implementationLevel": "softwarePlainRam", "cryptoFunctions": [ @@ -1681,12 +1681,12 @@ }, { "type": "crypto-asset", - "bom-ref": "alg:MAYO_5:x86_64", + "bom-ref": "alg:MAYO-5:x86_64", "name": "MAYO", "cryptoProperties": { "assetType": "algorithm", "algorithmProperties": { - "variant": "MAYO_5", + "variant": "MAYO-5", "primitive": "signature", "implementationLevel": "softwarePlainRam", "cryptoFunctions": [ @@ -2328,7 +2328,7 @@ ], "dependencies": [ { - "ref": "pkg:github/open-quantum-safe/liboqs@580d494efeee25edd354eaa2e0fe6581d552b827", + "ref": "pkg:github/open-quantum-safe/liboqs@ca5d956097e10672aaa9bb7994057bcc58291b65", "dependsOn": [ "alg:BIKE-L1:x86_64", "alg:BIKE-L3:x86_64", @@ -2406,14 +2406,14 @@ "alg:Falcon-padded-1024:generic", "alg:Falcon-padded-1024:x86_64", "alg:Falcon-padded-1024:armv8-a", - "alg:MAYO_1:generic", - "alg:MAYO_1:x86_64", - "alg:MAYO_2:generic", - "alg:MAYO_2:x86_64", - "alg:MAYO_3:generic", - "alg:MAYO_3:x86_64", - "alg:MAYO_5:generic", - "alg:MAYO_5:x86_64", + "alg:MAYO-1:generic", + "alg:MAYO-1:x86_64", + "alg:MAYO-2:generic", + "alg:MAYO-2:x86_64", + "alg:MAYO-3:generic", + "alg:MAYO-3:x86_64", + "alg:MAYO-5:generic", + "alg:MAYO-5:x86_64", "alg:ML-DSA-44-ipd:generic", "alg:ML-DSA-44-ipd:x86_64", "alg:ML-DSA-65-ipd:generic", @@ -3012,7 +3012,7 @@ "dependencyType": "uses" }, { - "ref": "alg:MAYO_1:generic", + "ref": "alg:MAYO-1:generic", "dependsOn": [ "alg:sha3", "alg:aes" @@ -3020,7 +3020,7 @@ "dependencyType": "uses" }, { - "ref": "alg:MAYO_1:x86_64", + "ref": "alg:MAYO-1:x86_64", "dependsOn": [ "alg:sha3", "alg:aes" @@ -3028,7 +3028,7 @@ "dependencyType": "uses" }, { - "ref": "alg:MAYO_2:generic", + "ref": "alg:MAYO-2:generic", "dependsOn": [ "alg:sha3", "alg:aes" @@ -3036,7 +3036,7 @@ "dependencyType": "uses" }, { - "ref": "alg:MAYO_2:x86_64", + "ref": "alg:MAYO-2:x86_64", "dependsOn": [ "alg:sha3", "alg:aes" @@ -3044,14 +3044,14 @@ "dependencyType": "uses" }, { - "ref": "alg:MAYO_3:generic", + "ref": "alg:MAYO-3:generic", "dependsOn": [ "alg:sha3" ], "dependencyType": "uses" }, { - "ref": "alg:MAYO_3:x86_64", + "ref": "alg:MAYO-3:x86_64", "dependsOn": [ "alg:sha3", "alg:aes" @@ -3059,14 +3059,14 @@ "dependencyType": "uses" }, { - "ref": "alg:MAYO_5:generic", + "ref": "alg:MAYO-5:generic", "dependsOn": [ "alg:sha3" ], "dependencyType": "uses" }, { - "ref": "alg:MAYO_5:x86_64", + "ref": "alg:MAYO-5:x86_64", "dependsOn": [ "alg:sha3", "alg:aes" diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml index eb8b42a2e..f9582fa74 100644 --- 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: nibbling-mayo - git_commit: fc9079fb5ac5cd4af98e3e0f094a0a3cf2a01499 + git_commit: cde2675ff404b0ae070e7dbc3d962ea0b026a81e sig_meta_path: 'META/{pretty_name_full}_META.yml' sig_scheme_path: '.' patches: [pqmayo-aes.patch, pqmayo-mem.patch] @@ -316,21 +316,21 @@ sigs: schemes: - scheme: "1" - pqclean_scheme: mayo_1 - pretty_name_full: MAYO_1 + pqclean_scheme: mayo-1 + pretty_name_full: MAYO-1 signed_msg_order: sig_then_msg - scheme: "2" - pqclean_scheme: mayo_2 - pretty_name_full: MAYO_2 + pqclean_scheme: mayo-2 + pretty_name_full: MAYO-2 signed_msg_order: sig_then_msg - scheme: "3" - pqclean_scheme: mayo_3 - pretty_name_full: MAYO_3 + pqclean_scheme: mayo-3 + pretty_name_full: MAYO-3 signed_msg_order: sig_then_msg - scheme: "5" - pqclean_scheme: mayo_5 - pretty_name_full: MAYO_5 + pqclean_scheme: mayo-5 + pretty_name_full: MAYO-5 signed_msg_order: sig_then_msg diff --git a/src/sig/mayo/CMakeLists.txt b/src/sig/mayo/CMakeLists.txt index 86b5ebaab..e049f7134 100644 --- a/src/sig/mayo/CMakeLists.txt +++ b/src/sig/mayo/CMakeLists.txt @@ -6,17 +6,17 @@ set(_MAYO_OBJS "") if(OQS_ENABLE_SIG_mayo_1) - 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) + 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 ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo-1_opt) target_include_directories(mayo_1_opt PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(mayo_1_opt PUBLIC -DMAYO_VARIANT=MAYO_1 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL) set(_MAYO_OBJS ${_MAYO_OBJS} $) endif() if(OQS_ENABLE_SIG_mayo_1_avx2) - 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) + 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) target_compile_options(mayo_1_avx2 PUBLIC -DMAYO_VARIANT=MAYO_1 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL) @@ -24,17 +24,17 @@ 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/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 ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo-2_opt) target_include_directories(mayo_2_opt PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(mayo_2_opt PUBLIC -DMAYO_VARIANT=MAYO_2 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL) set(_MAYO_OBJS ${_MAYO_OBJS} $) endif() if(OQS_ENABLE_SIG_mayo_2_avx2) - 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) + 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) target_compile_options(mayo_2_avx2 PUBLIC -DMAYO_VARIANT=MAYO_2 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL) @@ -42,17 +42,17 @@ 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/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 ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo-3_opt) target_include_directories(mayo_3_opt PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(mayo_3_opt PUBLIC -DMAYO_VARIANT=MAYO_3 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT) set(_MAYO_OBJS ${_MAYO_OBJS} $) endif() if(OQS_ENABLE_SIG_mayo_3_avx2) - 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) + 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) target_compile_options(mayo_3_avx2 PUBLIC -DMAYO_VARIANT=MAYO_3 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT) @@ -60,17 +60,17 @@ if(OQS_ENABLE_SIG_mayo_3_avx2) endif() if(OQS_ENABLE_SIG_mayo_5) - add_library(mayo_5_opt OBJECT sig_mayo_5.c pqmayo_mayo_5_opt/api.c pqmayo_mayo_5_opt/arithmetic.c pqmayo_mayo_5_opt/mayo.c pqmayo_mayo_5_opt/params.c) + add_library(mayo_5_opt OBJECT sig_mayo_5.c pqmayo_mayo-5_opt/api.c pqmayo_mayo-5_opt/arithmetic.c pqmayo_mayo-5_opt/mayo.c pqmayo_mayo-5_opt/params.c) target_compile_options(mayo_5_opt PUBLIC -DMAYO_VARIANT=MAYO_5 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT) - target_include_directories(mayo_5_opt PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo_5_opt) + target_include_directories(mayo_5_opt PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo-5_opt) target_include_directories(mayo_5_opt PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(mayo_5_opt PUBLIC -DMAYO_VARIANT=MAYO_5 -DMAYO_BUILD_TYPE_OPT -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT) set(_MAYO_OBJS ${_MAYO_OBJS} $) endif() if(OQS_ENABLE_SIG_mayo_5_avx2) - add_library(mayo_5_avx2 OBJECT pqmayo_mayo_5_avx2/api.c pqmayo_mayo_5_avx2/arithmetic.c pqmayo_mayo_5_avx2/mayo.c pqmayo_mayo_5_avx2/params.c) - target_include_directories(mayo_5_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo_5_avx2) + add_library(mayo_5_avx2 OBJECT pqmayo_mayo-5_avx2/api.c pqmayo_mayo-5_avx2/arithmetic.c pqmayo_mayo-5_avx2/mayo.c pqmayo_mayo-5_avx2/params.c) + target_include_directories(mayo_5_avx2 PRIVATE ${CMAKE_CURRENT_LIST_DIR}/pqmayo_mayo-5_avx2) target_include_directories(mayo_5_avx2 PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims) target_compile_options(mayo_5_avx2 PRIVATE -mavx2) target_compile_options(mayo_5_avx2 PUBLIC -DMAYO_VARIANT=MAYO_5 -DMAYO_BUILD_TYPE_AVX2 -DMAYO_AVX -DHAVE_RANDOMBYTES_NORETVAL -DHAVE_STACKEFFICIENT) diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/LICENSE b/src/sig/mayo/pqmayo_mayo-1_avx2/LICENSE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/LICENSE rename to src/sig/mayo/pqmayo_mayo-1_avx2/LICENSE diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/NOTICE b/src/sig/mayo/pqmayo_mayo-1_avx2/NOTICE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/NOTICE rename to src/sig/mayo/pqmayo_mayo-1_avx2/NOTICE diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/aes_ctr.h b/src/sig/mayo/pqmayo_mayo-1_avx2/aes_ctr.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/aes_ctr.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/aes_ctr.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/api.c b/src/sig/mayo/pqmayo_mayo-1_avx2/api.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/api.c rename to src/sig/mayo/pqmayo_mayo-1_avx2/api.c diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/api.h b/src/sig/mayo/pqmayo_mayo-1_avx2/api.h similarity index 97% rename from src/sig/mayo/pqmayo_mayo_1_avx2/api.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/api.h index 07a2f676b..86b7bd545 100644 --- a/src/sig/mayo/pqmayo_mayo_1_avx2/api.h +++ b/src/sig/mayo/pqmayo_mayo-1_avx2/api.h @@ -9,7 +9,7 @@ #define CRYPTO_PUBLICKEYBYTES 1168 #define CRYPTO_BYTES 321 -#define CRYPTO_ALGNAME "MAYO_1" +#define CRYPTO_ALGNAME "MAYO-1" #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair) int diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic.c b/src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic.c rename to src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic.c diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic.h b/src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic_common.h b/src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic_common.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/arithmetic_common.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/arithmetic_common.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/echelon_form.h b/src/sig/mayo/pqmayo_mayo-1_avx2/echelon_form.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/echelon_form.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/echelon_form.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/echelon_form_loop.h b/src/sig/mayo/pqmayo_mayo-1_avx2/echelon_form_loop.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/echelon_form_loop.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/echelon_form_loop.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/mayo.c b/src/sig/mayo/pqmayo_mayo-1_avx2/mayo.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/mayo.c rename to src/sig/mayo/pqmayo_mayo-1_avx2/mayo.c diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/mayo.h b/src/sig/mayo/pqmayo_mayo-1_avx2/mayo.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/mayo.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/mayo.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/mem.h b/src/sig/mayo/pqmayo_mayo-1_avx2/mem.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/mem.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/mem.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/params.c b/src/sig/mayo/pqmayo_mayo-1_avx2/params.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/params.c rename to src/sig/mayo/pqmayo_mayo-1_avx2/params.c diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/shuffle_arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-1_avx2/shuffle_arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/shuffle_arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/shuffle_arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/shuffle_arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-1_avx2/shuffle_arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/shuffle_arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/shuffle_arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/shuffle_arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-1_avx2/shuffle_arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/shuffle_arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/shuffle_arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_1_avx2/simple_arithmetic.h b/src/sig/mayo/pqmayo_mayo-1_avx2/simple_arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_avx2/simple_arithmetic.h rename to src/sig/mayo/pqmayo_mayo-1_avx2/simple_arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/LICENSE b/src/sig/mayo/pqmayo_mayo-1_opt/LICENSE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/LICENSE rename to src/sig/mayo/pqmayo_mayo-1_opt/LICENSE diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/NOTICE b/src/sig/mayo/pqmayo_mayo-1_opt/NOTICE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/NOTICE rename to src/sig/mayo/pqmayo_mayo-1_opt/NOTICE diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/aes_ctr.h b/src/sig/mayo/pqmayo_mayo-1_opt/aes_ctr.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/aes_ctr.h rename to src/sig/mayo/pqmayo_mayo-1_opt/aes_ctr.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/api.c b/src/sig/mayo/pqmayo_mayo-1_opt/api.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/api.c rename to src/sig/mayo/pqmayo_mayo-1_opt/api.c diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/api.h b/src/sig/mayo/pqmayo_mayo-1_opt/api.h similarity index 97% rename from src/sig/mayo/pqmayo_mayo_1_opt/api.h rename to src/sig/mayo/pqmayo_mayo-1_opt/api.h index 07a2f676b..86b7bd545 100644 --- a/src/sig/mayo/pqmayo_mayo_1_opt/api.h +++ b/src/sig/mayo/pqmayo_mayo-1_opt/api.h @@ -9,7 +9,7 @@ #define CRYPTO_PUBLICKEYBYTES 1168 #define CRYPTO_BYTES 321 -#define CRYPTO_ALGNAME "MAYO_1" +#define CRYPTO_ALGNAME "MAYO-1" #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair) int diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/arithmetic.c b/src/sig/mayo/pqmayo_mayo-1_opt/arithmetic.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/arithmetic.c rename to src/sig/mayo/pqmayo_mayo-1_opt/arithmetic.c diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/arithmetic.h b/src/sig/mayo/pqmayo_mayo-1_opt/arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/arithmetic.h rename to src/sig/mayo/pqmayo_mayo-1_opt/arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-1_opt/arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-1_opt/arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-1_opt/arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-1_opt/arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-1_opt/arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-1_opt/arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/arithmetic_common.h b/src/sig/mayo/pqmayo_mayo-1_opt/arithmetic_common.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/arithmetic_common.h rename to src/sig/mayo/pqmayo_mayo-1_opt/arithmetic_common.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/echelon_form.h b/src/sig/mayo/pqmayo_mayo-1_opt/echelon_form.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/echelon_form.h rename to src/sig/mayo/pqmayo_mayo-1_opt/echelon_form.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/mayo.c b/src/sig/mayo/pqmayo_mayo-1_opt/mayo.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/mayo.c rename to src/sig/mayo/pqmayo_mayo-1_opt/mayo.c diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/mayo.h b/src/sig/mayo/pqmayo_mayo-1_opt/mayo.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/mayo.h rename to src/sig/mayo/pqmayo_mayo-1_opt/mayo.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/mem.h b/src/sig/mayo/pqmayo_mayo-1_opt/mem.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/mem.h rename to src/sig/mayo/pqmayo_mayo-1_opt/mem.h diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/params.c b/src/sig/mayo/pqmayo_mayo-1_opt/params.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/params.c rename to src/sig/mayo/pqmayo_mayo-1_opt/params.c diff --git a/src/sig/mayo/pqmayo_mayo_1_opt/simple_arithmetic.h b/src/sig/mayo/pqmayo_mayo-1_opt/simple_arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_1_opt/simple_arithmetic.h rename to src/sig/mayo/pqmayo_mayo-1_opt/simple_arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/LICENSE b/src/sig/mayo/pqmayo_mayo-2_avx2/LICENSE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/LICENSE rename to src/sig/mayo/pqmayo_mayo-2_avx2/LICENSE diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/NOTICE b/src/sig/mayo/pqmayo_mayo-2_avx2/NOTICE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/NOTICE rename to src/sig/mayo/pqmayo_mayo-2_avx2/NOTICE diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/aes_ctr.h b/src/sig/mayo/pqmayo_mayo-2_avx2/aes_ctr.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/aes_ctr.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/aes_ctr.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/api.c b/src/sig/mayo/pqmayo_mayo-2_avx2/api.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/api.c rename to src/sig/mayo/pqmayo_mayo-2_avx2/api.c diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/api.h b/src/sig/mayo/pqmayo_mayo-2_avx2/api.h similarity index 97% rename from src/sig/mayo/pqmayo_mayo_2_avx2/api.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/api.h index 7c38c1a44..265a5639d 100644 --- a/src/sig/mayo/pqmayo_mayo_2_avx2/api.h +++ b/src/sig/mayo/pqmayo_mayo-2_avx2/api.h @@ -9,7 +9,7 @@ #define CRYPTO_PUBLICKEYBYTES 5488 #define CRYPTO_BYTES 180 -#define CRYPTO_ALGNAME "MAYO_2" +#define CRYPTO_ALGNAME "MAYO-2" #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair) int diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic.c b/src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic.c rename to src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic.c diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic.h b/src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic_common.h b/src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic_common.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/arithmetic_common.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/arithmetic_common.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/echelon_form.h b/src/sig/mayo/pqmayo_mayo-2_avx2/echelon_form.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/echelon_form.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/echelon_form.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/echelon_form_loop.h b/src/sig/mayo/pqmayo_mayo-2_avx2/echelon_form_loop.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/echelon_form_loop.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/echelon_form_loop.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/mayo.c b/src/sig/mayo/pqmayo_mayo-2_avx2/mayo.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/mayo.c rename to src/sig/mayo/pqmayo_mayo-2_avx2/mayo.c diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/mayo.h b/src/sig/mayo/pqmayo_mayo-2_avx2/mayo.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/mayo.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/mayo.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/mem.h b/src/sig/mayo/pqmayo_mayo-2_avx2/mem.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/mem.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/mem.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/params.c b/src/sig/mayo/pqmayo_mayo-2_avx2/params.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/params.c rename to src/sig/mayo/pqmayo_mayo-2_avx2/params.c diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/shuffle_arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-2_avx2/shuffle_arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/shuffle_arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/shuffle_arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/shuffle_arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-2_avx2/shuffle_arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/shuffle_arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/shuffle_arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/shuffle_arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-2_avx2/shuffle_arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/shuffle_arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/shuffle_arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_2_avx2/simple_arithmetic.h b/src/sig/mayo/pqmayo_mayo-2_avx2/simple_arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_avx2/simple_arithmetic.h rename to src/sig/mayo/pqmayo_mayo-2_avx2/simple_arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/LICENSE b/src/sig/mayo/pqmayo_mayo-2_opt/LICENSE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/LICENSE rename to src/sig/mayo/pqmayo_mayo-2_opt/LICENSE diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/NOTICE b/src/sig/mayo/pqmayo_mayo-2_opt/NOTICE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/NOTICE rename to src/sig/mayo/pqmayo_mayo-2_opt/NOTICE diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/aes_ctr.h b/src/sig/mayo/pqmayo_mayo-2_opt/aes_ctr.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/aes_ctr.h rename to src/sig/mayo/pqmayo_mayo-2_opt/aes_ctr.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/api.c b/src/sig/mayo/pqmayo_mayo-2_opt/api.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/api.c rename to src/sig/mayo/pqmayo_mayo-2_opt/api.c diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/api.h b/src/sig/mayo/pqmayo_mayo-2_opt/api.h similarity index 97% rename from src/sig/mayo/pqmayo_mayo_2_opt/api.h rename to src/sig/mayo/pqmayo_mayo-2_opt/api.h index 7c38c1a44..265a5639d 100644 --- a/src/sig/mayo/pqmayo_mayo_2_opt/api.h +++ b/src/sig/mayo/pqmayo_mayo-2_opt/api.h @@ -9,7 +9,7 @@ #define CRYPTO_PUBLICKEYBYTES 5488 #define CRYPTO_BYTES 180 -#define CRYPTO_ALGNAME "MAYO_2" +#define CRYPTO_ALGNAME "MAYO-2" #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair) int diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/arithmetic.c b/src/sig/mayo/pqmayo_mayo-2_opt/arithmetic.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/arithmetic.c rename to src/sig/mayo/pqmayo_mayo-2_opt/arithmetic.c diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/arithmetic.h b/src/sig/mayo/pqmayo_mayo-2_opt/arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/arithmetic.h rename to src/sig/mayo/pqmayo_mayo-2_opt/arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-2_opt/arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-2_opt/arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-2_opt/arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-2_opt/arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-2_opt/arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-2_opt/arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/arithmetic_common.h b/src/sig/mayo/pqmayo_mayo-2_opt/arithmetic_common.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/arithmetic_common.h rename to src/sig/mayo/pqmayo_mayo-2_opt/arithmetic_common.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/echelon_form.h b/src/sig/mayo/pqmayo_mayo-2_opt/echelon_form.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/echelon_form.h rename to src/sig/mayo/pqmayo_mayo-2_opt/echelon_form.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/mayo.c b/src/sig/mayo/pqmayo_mayo-2_opt/mayo.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/mayo.c rename to src/sig/mayo/pqmayo_mayo-2_opt/mayo.c diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/mayo.h b/src/sig/mayo/pqmayo_mayo-2_opt/mayo.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/mayo.h rename to src/sig/mayo/pqmayo_mayo-2_opt/mayo.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/mem.h b/src/sig/mayo/pqmayo_mayo-2_opt/mem.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/mem.h rename to src/sig/mayo/pqmayo_mayo-2_opt/mem.h diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/params.c b/src/sig/mayo/pqmayo_mayo-2_opt/params.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/params.c rename to src/sig/mayo/pqmayo_mayo-2_opt/params.c diff --git a/src/sig/mayo/pqmayo_mayo_2_opt/simple_arithmetic.h b/src/sig/mayo/pqmayo_mayo-2_opt/simple_arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_2_opt/simple_arithmetic.h rename to src/sig/mayo/pqmayo_mayo-2_opt/simple_arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/LICENSE b/src/sig/mayo/pqmayo_mayo-3_avx2/LICENSE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/LICENSE rename to src/sig/mayo/pqmayo_mayo-3_avx2/LICENSE diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/NOTICE b/src/sig/mayo/pqmayo_mayo-3_avx2/NOTICE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/NOTICE rename to src/sig/mayo/pqmayo_mayo-3_avx2/NOTICE diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/aes_ctr.h b/src/sig/mayo/pqmayo_mayo-3_avx2/aes_ctr.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/aes_ctr.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/aes_ctr.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/api.c b/src/sig/mayo/pqmayo_mayo-3_avx2/api.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/api.c rename to src/sig/mayo/pqmayo_mayo-3_avx2/api.c diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/api.h b/src/sig/mayo/pqmayo_mayo-3_avx2/api.h similarity index 97% rename from src/sig/mayo/pqmayo_mayo_3_avx2/api.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/api.h index 47899c181..b08c24704 100644 --- a/src/sig/mayo/pqmayo_mayo_3_avx2/api.h +++ b/src/sig/mayo/pqmayo_mayo-3_avx2/api.h @@ -9,7 +9,7 @@ #define CRYPTO_PUBLICKEYBYTES 2656 #define CRYPTO_BYTES 577 -#define CRYPTO_ALGNAME "MAYO_3" +#define CRYPTO_ALGNAME "MAYO-3" #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair) int diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic.c b/src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic.c rename to src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic.c diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic.h b/src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic_common.h b/src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic_common.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/arithmetic_common.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/arithmetic_common.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/echelon_form.h b/src/sig/mayo/pqmayo_mayo-3_avx2/echelon_form.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/echelon_form.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/echelon_form.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/echelon_form_loop.h b/src/sig/mayo/pqmayo_mayo-3_avx2/echelon_form_loop.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/echelon_form_loop.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/echelon_form_loop.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/mayo.c b/src/sig/mayo/pqmayo_mayo-3_avx2/mayo.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/mayo.c rename to src/sig/mayo/pqmayo_mayo-3_avx2/mayo.c diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/mayo.h b/src/sig/mayo/pqmayo_mayo-3_avx2/mayo.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/mayo.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/mayo.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/mem.h b/src/sig/mayo/pqmayo_mayo-3_avx2/mem.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/mem.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/mem.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/params.c b/src/sig/mayo/pqmayo_mayo-3_avx2/params.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/params.c rename to src/sig/mayo/pqmayo_mayo-3_avx2/params.c diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/shuffle_arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-3_avx2/shuffle_arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/shuffle_arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/shuffle_arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/shuffle_arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-3_avx2/shuffle_arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/shuffle_arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/shuffle_arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/shuffle_arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-3_avx2/shuffle_arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/shuffle_arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/shuffle_arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_3_avx2/simple_arithmetic.h b/src/sig/mayo/pqmayo_mayo-3_avx2/simple_arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_avx2/simple_arithmetic.h rename to src/sig/mayo/pqmayo_mayo-3_avx2/simple_arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/LICENSE b/src/sig/mayo/pqmayo_mayo-3_opt/LICENSE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/LICENSE rename to src/sig/mayo/pqmayo_mayo-3_opt/LICENSE diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/NOTICE b/src/sig/mayo/pqmayo_mayo-3_opt/NOTICE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/NOTICE rename to src/sig/mayo/pqmayo_mayo-3_opt/NOTICE diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/aes_ctr.h b/src/sig/mayo/pqmayo_mayo-3_opt/aes_ctr.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/aes_ctr.h rename to src/sig/mayo/pqmayo_mayo-3_opt/aes_ctr.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/api.c b/src/sig/mayo/pqmayo_mayo-3_opt/api.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/api.c rename to src/sig/mayo/pqmayo_mayo-3_opt/api.c diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/api.h b/src/sig/mayo/pqmayo_mayo-3_opt/api.h similarity index 97% rename from src/sig/mayo/pqmayo_mayo_3_opt/api.h rename to src/sig/mayo/pqmayo_mayo-3_opt/api.h index 47899c181..b08c24704 100644 --- a/src/sig/mayo/pqmayo_mayo_3_opt/api.h +++ b/src/sig/mayo/pqmayo_mayo-3_opt/api.h @@ -9,7 +9,7 @@ #define CRYPTO_PUBLICKEYBYTES 2656 #define CRYPTO_BYTES 577 -#define CRYPTO_ALGNAME "MAYO_3" +#define CRYPTO_ALGNAME "MAYO-3" #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair) int diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/arithmetic.c b/src/sig/mayo/pqmayo_mayo-3_opt/arithmetic.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/arithmetic.c rename to src/sig/mayo/pqmayo_mayo-3_opt/arithmetic.c diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/arithmetic.h b/src/sig/mayo/pqmayo_mayo-3_opt/arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/arithmetic.h rename to src/sig/mayo/pqmayo_mayo-3_opt/arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-3_opt/arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-3_opt/arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-3_opt/arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-3_opt/arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-3_opt/arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-3_opt/arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/arithmetic_common.h b/src/sig/mayo/pqmayo_mayo-3_opt/arithmetic_common.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/arithmetic_common.h rename to src/sig/mayo/pqmayo_mayo-3_opt/arithmetic_common.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/echelon_form.h b/src/sig/mayo/pqmayo_mayo-3_opt/echelon_form.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/echelon_form.h rename to src/sig/mayo/pqmayo_mayo-3_opt/echelon_form.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/mayo.c b/src/sig/mayo/pqmayo_mayo-3_opt/mayo.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/mayo.c rename to src/sig/mayo/pqmayo_mayo-3_opt/mayo.c diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/mayo.h b/src/sig/mayo/pqmayo_mayo-3_opt/mayo.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/mayo.h rename to src/sig/mayo/pqmayo_mayo-3_opt/mayo.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/mem.h b/src/sig/mayo/pqmayo_mayo-3_opt/mem.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/mem.h rename to src/sig/mayo/pqmayo_mayo-3_opt/mem.h diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/params.c b/src/sig/mayo/pqmayo_mayo-3_opt/params.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/params.c rename to src/sig/mayo/pqmayo_mayo-3_opt/params.c diff --git a/src/sig/mayo/pqmayo_mayo_3_opt/simple_arithmetic.h b/src/sig/mayo/pqmayo_mayo-3_opt/simple_arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_3_opt/simple_arithmetic.h rename to src/sig/mayo/pqmayo_mayo-3_opt/simple_arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/LICENSE b/src/sig/mayo/pqmayo_mayo-5_avx2/LICENSE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/LICENSE rename to src/sig/mayo/pqmayo_mayo-5_avx2/LICENSE diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/NOTICE b/src/sig/mayo/pqmayo_mayo-5_avx2/NOTICE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/NOTICE rename to src/sig/mayo/pqmayo_mayo-5_avx2/NOTICE diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/aes_ctr.h b/src/sig/mayo/pqmayo_mayo-5_avx2/aes_ctr.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/aes_ctr.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/aes_ctr.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/api.c b/src/sig/mayo/pqmayo_mayo-5_avx2/api.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/api.c rename to src/sig/mayo/pqmayo_mayo-5_avx2/api.c diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/api.h b/src/sig/mayo/pqmayo_mayo-5_avx2/api.h similarity index 97% rename from src/sig/mayo/pqmayo_mayo_5_avx2/api.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/api.h index fa1ebbb79..404d185c0 100644 --- a/src/sig/mayo/pqmayo_mayo_5_avx2/api.h +++ b/src/sig/mayo/pqmayo_mayo-5_avx2/api.h @@ -9,7 +9,7 @@ #define CRYPTO_PUBLICKEYBYTES 5008 #define CRYPTO_BYTES 838 -#define CRYPTO_ALGNAME "MAYO_5" +#define CRYPTO_ALGNAME "MAYO-5" #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair) int diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic.c b/src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic.c rename to src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic.c diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic.h b/src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic_common.h b/src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic_common.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/arithmetic_common.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/arithmetic_common.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/echelon_form.h b/src/sig/mayo/pqmayo_mayo-5_avx2/echelon_form.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/echelon_form.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/echelon_form.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/echelon_form_loop.h b/src/sig/mayo/pqmayo_mayo-5_avx2/echelon_form_loop.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/echelon_form_loop.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/echelon_form_loop.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/mayo.c b/src/sig/mayo/pqmayo_mayo-5_avx2/mayo.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/mayo.c rename to src/sig/mayo/pqmayo_mayo-5_avx2/mayo.c diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/mayo.h b/src/sig/mayo/pqmayo_mayo-5_avx2/mayo.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/mayo.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/mayo.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/mem.h b/src/sig/mayo/pqmayo_mayo-5_avx2/mem.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/mem.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/mem.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/params.c b/src/sig/mayo/pqmayo_mayo-5_avx2/params.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/params.c rename to src/sig/mayo/pqmayo_mayo-5_avx2/params.c diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/shuffle_arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-5_avx2/shuffle_arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/shuffle_arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/shuffle_arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/shuffle_arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-5_avx2/shuffle_arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/shuffle_arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/shuffle_arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/shuffle_arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-5_avx2/shuffle_arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/shuffle_arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/shuffle_arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_5_avx2/simple_arithmetic.h b/src/sig/mayo/pqmayo_mayo-5_avx2/simple_arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_avx2/simple_arithmetic.h rename to src/sig/mayo/pqmayo_mayo-5_avx2/simple_arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/LICENSE b/src/sig/mayo/pqmayo_mayo-5_opt/LICENSE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/LICENSE rename to src/sig/mayo/pqmayo_mayo-5_opt/LICENSE diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/NOTICE b/src/sig/mayo/pqmayo_mayo-5_opt/NOTICE similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/NOTICE rename to src/sig/mayo/pqmayo_mayo-5_opt/NOTICE diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/aes_ctr.h b/src/sig/mayo/pqmayo_mayo-5_opt/aes_ctr.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/aes_ctr.h rename to src/sig/mayo/pqmayo_mayo-5_opt/aes_ctr.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/api.c b/src/sig/mayo/pqmayo_mayo-5_opt/api.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/api.c rename to src/sig/mayo/pqmayo_mayo-5_opt/api.c diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/api.h b/src/sig/mayo/pqmayo_mayo-5_opt/api.h similarity index 97% rename from src/sig/mayo/pqmayo_mayo_5_opt/api.h rename to src/sig/mayo/pqmayo_mayo-5_opt/api.h index fa1ebbb79..404d185c0 100644 --- a/src/sig/mayo/pqmayo_mayo_5_opt/api.h +++ b/src/sig/mayo/pqmayo_mayo-5_opt/api.h @@ -9,7 +9,7 @@ #define CRYPTO_PUBLICKEYBYTES 5008 #define CRYPTO_BYTES 838 -#define CRYPTO_ALGNAME "MAYO_5" +#define CRYPTO_ALGNAME "MAYO-5" #define crypto_sign_keypair MAYO_NAMESPACE(crypto_sign_keypair) int diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/arithmetic.c b/src/sig/mayo/pqmayo_mayo-5_opt/arithmetic.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/arithmetic.c rename to src/sig/mayo/pqmayo_mayo-5_opt/arithmetic.c diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/arithmetic.h b/src/sig/mayo/pqmayo_mayo-5_opt/arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/arithmetic.h rename to src/sig/mayo/pqmayo_mayo-5_opt/arithmetic.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/arithmetic_128.h b/src/sig/mayo/pqmayo_mayo-5_opt/arithmetic_128.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/arithmetic_128.h rename to src/sig/mayo/pqmayo_mayo-5_opt/arithmetic_128.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/arithmetic_64.h b/src/sig/mayo/pqmayo_mayo-5_opt/arithmetic_64.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/arithmetic_64.h rename to src/sig/mayo/pqmayo_mayo-5_opt/arithmetic_64.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/arithmetic_96.h b/src/sig/mayo/pqmayo_mayo-5_opt/arithmetic_96.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/arithmetic_96.h rename to src/sig/mayo/pqmayo_mayo-5_opt/arithmetic_96.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/arithmetic_common.h b/src/sig/mayo/pqmayo_mayo-5_opt/arithmetic_common.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/arithmetic_common.h rename to src/sig/mayo/pqmayo_mayo-5_opt/arithmetic_common.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/echelon_form.h b/src/sig/mayo/pqmayo_mayo-5_opt/echelon_form.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/echelon_form.h rename to src/sig/mayo/pqmayo_mayo-5_opt/echelon_form.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/mayo.c b/src/sig/mayo/pqmayo_mayo-5_opt/mayo.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/mayo.c rename to src/sig/mayo/pqmayo_mayo-5_opt/mayo.c diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/mayo.h b/src/sig/mayo/pqmayo_mayo-5_opt/mayo.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/mayo.h rename to src/sig/mayo/pqmayo_mayo-5_opt/mayo.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/mem.h b/src/sig/mayo/pqmayo_mayo-5_opt/mem.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/mem.h rename to src/sig/mayo/pqmayo_mayo-5_opt/mem.h diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/params.c b/src/sig/mayo/pqmayo_mayo-5_opt/params.c similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/params.c rename to src/sig/mayo/pqmayo_mayo-5_opt/params.c diff --git a/src/sig/mayo/pqmayo_mayo_5_opt/simple_arithmetic.h b/src/sig/mayo/pqmayo_mayo-5_opt/simple_arithmetic.h similarity index 100% rename from src/sig/mayo/pqmayo_mayo_5_opt/simple_arithmetic.h rename to src/sig/mayo/pqmayo_mayo-5_opt/simple_arithmetic.h diff --git a/src/sig/sig.h b/src/sig/sig.h index f847104aa..bb2a73821 100644 --- a/src/sig/sig.h +++ b/src/sig/sig.h @@ -82,14 +82,14 @@ extern "C" { #define OQS_SIG_alg_sphincs_shake_256f_simple "SPHINCS+-SHAKE-256f-simple" /** Algorithm identifier for SPHINCS+-SHAKE-256s-simple */ #define OQS_SIG_alg_sphincs_shake_256s_simple "SPHINCS+-SHAKE-256s-simple" -/** Algorithm identifier for MAYO_1 */ -#define OQS_SIG_alg_mayo_1 "MAYO_1" -/** Algorithm identifier for MAYO_2 */ -#define OQS_SIG_alg_mayo_2 "MAYO_2" -/** Algorithm identifier for MAYO_3 */ -#define OQS_SIG_alg_mayo_3 "MAYO_3" -/** Algorithm identifier for MAYO_5 */ -#define OQS_SIG_alg_mayo_5 "MAYO_5" +/** Algorithm identifier for MAYO-1 */ +#define OQS_SIG_alg_mayo_1 "MAYO-1" +/** Algorithm identifier for MAYO-2 */ +#define OQS_SIG_alg_mayo_2 "MAYO-2" +/** Algorithm identifier for MAYO-3 */ +#define OQS_SIG_alg_mayo_3 "MAYO-3" +/** Algorithm identifier for MAYO-5 */ +#define OQS_SIG_alg_mayo_5 "MAYO-5" ///// OQS_COPY_FROM_UPSTREAM_FRAGMENT_ALG_IDENTIFIER_END // EDIT-WHEN-ADDING-SIG ///// OQS_COPY_FROM_UPSTREAM_FRAGMENT_ALGS_LENGTH_START diff --git a/tests/KATs/sig/kats.json b/tests/KATs/sig/kats.json index f6a8ede1a..5f75aca4a 100644 --- a/tests/KATs/sig/kats.json +++ b/tests/KATs/sig/kats.json @@ -27,6 +27,18 @@ "all": "362ecc0537ca1fe25143fb7ccb04de8ee7703469d13ebcf311ab124a5c374a65", "single": "91842d41138e7cfaf6e2e8f12a03c3b3411302255121e4d07d02f91a003c0395" }, + "MAYO-1": { + "single": "ba2473dedd92cf3b8a1fc14fc22f2ffdde972c8b64cfcd8cddb4f803e48df017" + }, + "MAYO-2": { + "single": "72cb237642b2c0c4e7f8c824d9c8601ac7189784649d28dbb2cccfb94732c9a3" + }, + "MAYO-3": { + "single": "dbc49f4fdfa0de69d416051215cb53c042c4a329d325452d079f3734b7467a6b" + }, + "MAYO-5": { + "single": "f2c1c69045c7d15e714a04119965e8a7007ef54f9293158587560227c97b237d" + }, "MAYO_1": { "all": "5cf156cf74fc65b43863399ecc4b26ad7b4b3b2cd8485215dc0c011e2825b145", "single": "ba2473dedd92cf3b8a1fc14fc22f2ffdde972c8b64cfcd8cddb4f803e48df017" diff --git a/tests/kat_sig.c b/tests/kat_sig.c index 876a720aa..ffb045692 100644 --- a/tests/kat_sig.c +++ b/tests/kat_sig.c @@ -272,7 +272,7 @@ OQS_STATUS combine_message_signature(uint8_t **signed_msg, size_t *signed_msg_le memcpy(*signed_msg, signature, signature_len); memcpy(*signed_msg + signature_len, msg, msg_len); return OQS_SUCCESS; - } else if (0 == strcmp(sig->method_name, "MAYO_1")) { + } else if (0 == strcmp(sig->method_name, "MAYO-1")) { // signed_msg = signature || msg *signed_msg_len = signature_len + msg_len; *signed_msg = malloc(*signed_msg_len); @@ -282,7 +282,7 @@ OQS_STATUS combine_message_signature(uint8_t **signed_msg, size_t *signed_msg_le memcpy(*signed_msg, signature, signature_len); memcpy(*signed_msg + signature_len, msg, msg_len); return OQS_SUCCESS; - } else if (0 == strcmp(sig->method_name, "MAYO_2")) { + } else if (0 == strcmp(sig->method_name, "MAYO-2")) { // signed_msg = signature || msg *signed_msg_len = signature_len + msg_len; *signed_msg = malloc(*signed_msg_len); @@ -292,7 +292,7 @@ OQS_STATUS combine_message_signature(uint8_t **signed_msg, size_t *signed_msg_le memcpy(*signed_msg, signature, signature_len); memcpy(*signed_msg + signature_len, msg, msg_len); return OQS_SUCCESS; - } else if (0 == strcmp(sig->method_name, "MAYO_3")) { + } else if (0 == strcmp(sig->method_name, "MAYO-3")) { // signed_msg = signature || msg *signed_msg_len = signature_len + msg_len; *signed_msg = malloc(*signed_msg_len); @@ -302,7 +302,7 @@ OQS_STATUS combine_message_signature(uint8_t **signed_msg, size_t *signed_msg_le memcpy(*signed_msg, signature, signature_len); memcpy(*signed_msg + signature_len, msg, msg_len); return OQS_SUCCESS; - } else if (0 == strcmp(sig->method_name, "MAYO_5")) { + } else if (0 == strcmp(sig->method_name, "MAYO-5")) { // signed_msg = signature || msg *signed_msg_len = signature_len + msg_len; *signed_msg = malloc(*signed_msg_len);