From 382119fac0353fcf21d2770be5aca91f87291427 Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Tue, 1 Oct 2024 16:18:01 +0200 Subject: [PATCH] Update to 0.11.0 version --- .gitignore | 1 + liboqs-0.10.0-std-iana.patch | 9 +------ liboqs-0.11.0-acvp_patch.patch | 43 ++++++++++++++++++++++++++++++++++ liboqs.spec | 11 +++++---- sources | 2 +- 5 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 liboqs-0.11.0-acvp_patch.patch diff --git a/.gitignore b/.gitignore index a57cf74..3faa7c4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /0.9.2.tar.gz /0.10.0.tar.gz /0.10.1.tar.gz +/0.11.0.tar.gz diff --git a/liboqs-0.10.0-std-iana.patch b/liboqs-0.10.0-std-iana.patch index 88983dd..58b68db 100644 --- a/liboqs-0.10.0-std-iana.patch +++ b/liboqs-0.10.0-std-iana.patch @@ -11,11 +11,4 @@ diff -up liboqs-0.10.0/.CMake/alg_support.cmake.xxx liboqs-0.10.0/.CMake/alg_sup +##### OQS_COPY_FROM_UPSTREAM_FRAGMENT_LIST_STANDARDIZED_ALGS_END elseif(${OQS_ALGS_ENABLED} STREQUAL "NIST_R4") filter_algs("KEM_classic_mceliece_348864;KEM_classic_mceliece_348864f;KEM_classic_mceliece_460896;KEM_classic_mceliece_460896f;KEM_classic_mceliece_6688128;KEM_classic_mceliece_6688128f;KEM_classic_mceliece_6960119;KEM_classic_mceliece_6960119f;KEM_classic_mceliece_8192128;KEM_classic_mceliece_8192128f;KEM_hqc_128;KEM_hqc_192;KEM_hqc_256;KEM_bike_l1;KEM_bike_l3;KEM_bike_l5") - else() -@@ -509,4 +513,4 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darw - else() - set(OQS_ENABLE_SHA3_xkcp_low_avx2 OFF) - endif() --endif() -\ No newline at end of file -+endif() + elseif(${OQS_ALGS_ENABLED} STREQUAL "NIST_SIG_ONRAMP") diff --git a/liboqs-0.11.0-acvp_patch.patch b/liboqs-0.11.0-acvp_patch.patch new file mode 100644 index 0000000..65afed3 --- /dev/null +++ b/liboqs-0.11.0-acvp_patch.patch @@ -0,0 +1,43 @@ +diff --git a/tests/test_acvp_vectors.py b/tests/test_acvp_vectors.py +index 4eee4b810..ddd64003c 100644 +--- a/tests/test_acvp_vectors.py ++++ b/tests/test_acvp_vectors.py +@@ -36,9 +36,10 @@ def test_acvp_vec_kem_keygen(kem_name): + z = testCase["z"] + pk = testCase["ek"] + sk = testCase["dk"] +- ++ ++ build_dir = helpers.get_current_build_dir_name() + helpers.run_subprocess( +- ['build/tests/vectors_kem', kem_name, "keyGen", d+z, pk, sk] ++ [f'{build_dir}/tests/vectors_kem', kem_name, "keyGen", d+z, pk, sk] + ) + + assert(variantFound == True) +@@ -66,9 +67,10 @@ def test_acvp_vec_kem_encdec_aft(kem_name): + #expected results + k = testCase["k"] + c = testCase["c"] +- ++ ++ build_dir = helpers.get_current_build_dir_name() + helpers.run_subprocess( +- ['build/tests/vectors_kem', kem_name, "encDecAFT", m, pk, k, c] ++ [f'{build_dir}/tests/vectors_kem', kem_name, "encDecAFT", m, pk, k, c] + ) + + assert(variantFound == True) +@@ -94,9 +96,10 @@ def test_acvp_vec_kem_encdec_val(kem_name): + c = testCase["c"] + #expected results + k = testCase["k"] +- ++ ++ build_dir = helpers.get_current_build_dir_name() + helpers.run_subprocess( +- ['build/tests/vectors_kem', kem_name, "encDecVAL", sk, k, c] ++ [f'{build_dir}/tests/vectors_kem', kem_name, "encDecVAL", sk, k, c] + ) + + assert(variantFound == True) diff --git a/liboqs.spec b/liboqs.spec index f432872..5fc0a8e 100644 --- a/liboqs.spec +++ b/liboqs.spec @@ -1,7 +1,7 @@ -%global oqs_version 0.10.1 +%global oqs_version 0.11.0 Name: liboqs Version: %{oqs_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: liboqs is an open source C library for quantum-safe cryptographic algorithms. #liboqs uses MIT license by itself but includes several files licensed under different terms. @@ -11,7 +11,7 @@ Summary: liboqs is an open source C library for quantum-safe cryptographic al License: MIT AND Apache 2.0 AND BSD 3-Clause AND (BSD-3-Clause OR GPL-1.0-or-later) AND CC0-1.0 AND Unlicense URL: https://github.com/open-quantum-safe/liboqs.git Source: https://github.com/open-quantum-safe/liboqs/archive/refs/tags/%{oqs_version}.tar.gz -Patch1: liboqs-0.10.0-dlopen-openssl.patch +Patch1: liboqs-0.11.0-acvp_patch.patch Patch2: liboqs-0.10.0-std-iana.patch BuildRequires: ninja-build @@ -82,7 +82,7 @@ done %files %license LICENSE.txt %{_libdir}/liboqs.so.%{oqs_version} -%{_libdir}/liboqs.so.5 +%{_libdir}/liboqs.so.6 %files devel %{_libdir}/liboqs.so @@ -99,6 +99,9 @@ done #%doc %%{_datadir}/doc/oqs/xml/* %changelog +* Mon Sep 30 2024 Dmitry Belyavskiy - 0.11.0-1 +- Update to 0.11.0 version + * Fri Aug 02 2024 Lokesh Mandvekar - 0.10.1-3 - Add PQ container test diff --git a/sources b/sources index 0b0076a..ff5f59c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.10.1.tar.gz) = 7049c084d9bef2064ff5ad4964bf5071b2fe0553c2dfe7522b32b3a441fcdd46f718adeca63a163e95d5f86c3f092b02ffa3190822861f566b498654711c722d +SHA512 (0.11.0.tar.gz) = 10dc002f148895cc304d6b0db14734d9149aeae43308caee4fe5c39ee18fbd7297c65f5c67df0a39b84534f676f209bbcda591b353128b4bab152cb69177c6ae