From 41c3db21b6b83899552096a4183acd47d5e25d0e Mon Sep 17 00:00:00 2001 From: Spencer Wilson Date: Thu, 19 Oct 2023 09:49:49 -0400 Subject: [PATCH] Don't apply PQClean Dilithium and Kyber patches --- .CMake/alg_support.cmake | 18 ------------------ .../copy_from_upstream/copy_from_upstream.yml | 10 +++++----- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/.CMake/alg_support.cmake b/.CMake/alg_support.cmake index dd9ced052f..c9e1bc4a8e 100644 --- a/.CMake/alg_support.cmake +++ b/.CMake/alg_support.cmake @@ -176,26 +176,8 @@ endif() option(OQS_ENABLE_KEM_HQC "Enable hqc algorithm family" ON) cmake_dependent_option(OQS_ENABLE_KEM_hqc_128 "" ON "OQS_ENABLE_KEM_HQC" OFF) -if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin") -if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS AND OQS_USE_BMI1_INSTRUCTIONS AND OQS_USE_PCLMULQDQ_INSTRUCTIONS)) - cmake_dependent_option(OQS_ENABLE_KEM_hqc_128_avx2 "" ON "OQS_ENABLE_KEM_hqc_128" OFF) -endif() -endif() - cmake_dependent_option(OQS_ENABLE_KEM_hqc_192 "" ON "OQS_ENABLE_KEM_HQC" OFF) -if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin") -if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS AND OQS_USE_BMI1_INSTRUCTIONS AND OQS_USE_PCLMULQDQ_INSTRUCTIONS)) - cmake_dependent_option(OQS_ENABLE_KEM_hqc_192_avx2 "" ON "OQS_ENABLE_KEM_hqc_192" OFF) -endif() -endif() - cmake_dependent_option(OQS_ENABLE_KEM_hqc_256 "" ON "OQS_ENABLE_KEM_HQC" OFF) -if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin") -if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS AND OQS_USE_BMI1_INSTRUCTIONS AND OQS_USE_PCLMULQDQ_INSTRUCTIONS)) - cmake_dependent_option(OQS_ENABLE_KEM_hqc_256_avx2 "" ON "OQS_ENABLE_KEM_hqc_256" OFF) -endif() -endif() - option(OQS_ENABLE_KEM_KYBER "Enable kyber algorithm family" ON) cmake_dependent_option(OQS_ENABLE_KEM_kyber_512 "" ON "OQS_ENABLE_KEM_KYBER" OFF) diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml index 7c83c2d770..ceacba4b8c 100644 --- a/scripts/copy_from_upstream/copy_from_upstream.yml +++ b/scripts/copy_from_upstream/copy_from_upstream.yml @@ -3,12 +3,12 @@ upstreams: name: pqclean git_url: https://github.com/PQClean/PQClean.git git_branch: master - git_commit: 8e220a87308154d48fdfac40abbb191ac7fce06a + git_commit: 0657749a785db30e7f49e9435452cb042edb1852 kem_meta_path: 'crypto_kem/{pqclean_scheme}/META.yml' sig_meta_path: 'crypto_sign/{pqclean_scheme}/META.yml' kem_scheme_path: 'crypto_kem/{pqclean_scheme}' sig_scheme_path: 'crypto_sign/{pqclean_scheme}' - patches: [pqclean-sphincs.patch, pqclean-dilithium-arm-randomized-signing.patch, pqclean-kyber-armneon-shake-fixes.patch, pqclean-kyber-armneon-768-1024-fixes.patch] + patches: [pqclean-sphincs.patch] ignore: pqclean_sphincs-shake-256s-simple_aarch64, pqclean_sphincs-shake-256s-simple_aarch64, pqclean_sphincs-shake-256f-simple_aarch64, pqclean_sphincs-shake-192s-simple_aarch64, pqclean_sphincs-shake-192f-simple_aarch64, pqclean_sphincs-shake-128s-simple_aarch64, pqclean_sphincs-shake-128f-simple_aarch64 - name: pqcrystals-kyber @@ -79,15 +79,15 @@ kems: schemes: - scheme: "128" - pqclean_scheme: hqc-rmrs-128 + pqclean_scheme: hqc-128 pretty_name_full: HQC-128 - scheme: "192" - pqclean_scheme: hqc-rmrs-192 + pqclean_scheme: hqc-192 pretty_name_full: HQC-192 - scheme: "256" - pqclean_scheme: hqc-rmrs-256 + pqclean_scheme: hqc-256 pretty_name_full: HQC-256 - name: kyber