Merge remote-tracking branch 'up/main' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -1,2 +1,5 @@
 /0.8.0.tar.gz
 /0.9.0.tar.gz
+/0.9.2.tar.gz
+/0.10.0.tar.gz
+/0.10.1.tar.gz

liboqs-0.10.0-std-iana.patch

@@ -0,0 +1,21 @@
+diff -up liboqs-0.10.0/.CMake/alg_support.cmake.xxx liboqs-0.10.0/.CMake/alg_support.cmake
+--- liboqs-0.10.0/.CMake/alg_support.cmake.xxx	2024-05-06 05:52:52.668502602 -0400
++++ liboqs-0.10.0/.CMake/alg_support.cmake	2024-05-06 05:57:03.715008552 -0400
+@@ -182,6 +182,10 @@ elseif (${OQS_ALGS_ENABLED} STREQUAL "ST
+ ##### OQS_COPY_FROM_UPSTREAM_FRAGMENT_LIST_STANDARDIZED_ALGS_START
+ 	filter_algs("KEM_ml_kem_512;KEM_ml_kem_768;KEM_ml_kem_1024;SIG_ml_dsa_44;SIG_ml_dsa_65;SIG_ml_dsa_87;SIG_falcon_512;SIG_falcon_1024;SIG_falcon_padded_512;SIG_falcon_padded_1024;SIG_sphincs_sha2_128f_simple;SIG_sphincs_sha2_128s_simple;SIG_sphincs_sha2_192f_simple;SIG_sphincs_sha2_192s_simple;SIG_sphincs_sha2_256f_simple;SIG_sphincs_sha2_256s_simple;SIG_sphincs_shake_128f_simple;SIG_sphincs_shake_128s_simple;SIG_sphincs_shake_192f_simple;SIG_sphincs_shake_192s_simple;SIG_sphincs_shake_256f_simple;SIG_sphincs_shake_256s_simple")
+ ##### OQS_COPY_FROM_UPSTREAM_FRAGMENT_LIST_STANDARDIZED_ALGS_END
++elseif (${OQS_ALGS_ENABLED} STREQUAL "STD_IANA")
++##### OQS_COPY_FROM_UPSTREAM_FRAGMENT_LIST_STANDARDIZED_ALGS_START
++	filter_algs("KEM_kyber_768;KEM_ml_kem_512;KEM_ml_kem_768;KEM_ml_kem_1024;SIG_ml_dsa_44;SIG_ml_dsa_65;SIG_ml_dsa_87;SIG_falcon_512;SIG_falcon_1024;SIG_falcon_padded_512;SIG_falcon_padded_1024;SIG_sphincs_sha2_128f_simple;SIG_sphincs_sha2_128s_simple;SIG_sphincs_sha2_192f_simple;SIG_sphincs_sha2_192s_simple;SIG_sphincs_sha2_256f_simple;SIG_sphincs_sha2_256s_simple;SIG_sphincs_shake_128f_simple;SIG_sphincs_shake_128s_simple;SIG_sphincs_shake_192f_simple;SIG_sphincs_shake_192s_simple;SIG_sphincs_shake_256f_simple;SIG_sphincs_shake_256s_simple")
++##### 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()

liboqs.spec

@@ -1,4 +1,4 @@
-%global oqs_version 0.9.0
+%global oqs_version 0.10.1
 Name:       liboqs
 Version:    %{oqs_version}
 Release:    2.0.riscv64%{?dist}
@@ -10,7 +10,9 @@ Summary:    liboqs is an open source C library for quantum-safe cryptographic al
 #see https://github.com/open-quantum-safe/liboqs/blob/main/README.md#license for more details
 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/0.9.0.tar.gz
+Source:     https://github.com/open-quantum-safe/liboqs/archive/refs/tags/%{oqs_version}.tar.gz
+Patch1:	    liboqs-0.10.0-dlopen-openssl.patch
+Patch2:	    liboqs-0.10.0-std-iana.patch
 
 BuildRequires: ninja-build
 BuildRequires: cmake
@@ -62,7 +64,7 @@ sed -e '/COMMAND.*pytest/s|$| --ignore tests/test_code_conventions.py|' \
     -i tests/CMakeLists.txt
 
 %build
-%cmake -GNinja -DBUILD_SHARED_LIBS=ON -DOQS_USE_AES_OPENSSL=ON -DOQS_USE_AES_INSTRUCTIONS=OFF -DOQS_DIST_BUILD=ON -DOQS_ALGS_ENABLED=STD -DOQS_USE_SHA3_OPENSSL=ON -DCMAKE_BUILD_TYPE=Debug -LAH ..
+%cmake -GNinja -DBUILD_SHARED_LIBS=ON -DOQS_USE_AES_OPENSSL=ON -DOQS_USE_AES_INSTRUCTIONS=OFF -DOQS_DIST_BUILD=ON -DOQS_ALGS_ENABLED=STD_IANA -DOQS_USE_SHA3_OPENSSL=ON -DOQS_DLOPEN_OPENSSL=ON -DCMAKE_BUILD_TYPE=Debug -LAH
 %cmake_build
 #ninja gen_docs
 
@@ -82,7 +84,7 @@ done
 %files
 %license LICENSE.txt
 %{_libdir}/liboqs.so.%{oqs_version}
-%{_libdir}/liboqs.so.4
+%{_libdir}/liboqs.so.5
 
 %files devel
 %{_libdir}/liboqs.so
@@ -99,9 +101,33 @@ done
 #%doc %%{_datadir}/doc/oqs/xml/*
 
 %changelog
-* Mon Jan 08 2024 David Abdurachmanov <davidlt@rivosinc.com> - 0.9.0-2.0.riscv64
+* Wed Jul 24 2024 David Abdurachmanov <davidlt@rivosinc.com> - 0.10.1-2.0.riscv64
 - Properly check valgrind arches
 
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jun 12 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 0.10.1-1
+- Update to 0.10.1 version (CVE-2024-36405)
+
+* Mon May 06 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 0.10.0-3
+- Support IANA pre-standard Kyber groups for compatibility's sake
+
+* Wed Apr 24 2024 Daiki Ueno <dueno@redhat.com> - 0.10.0-2
+- Load OpenSSL libcrypto.so on demand through dlopen
+
+* Wed Mar 27 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 0.10.0-1
+- Update to 0.10.0 version
+
+* Thu Feb 01 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 0.9.2-1
+- Update to 0.9.2 version
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Oct 30 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.9.0-2
 - Skip code style tests
 

sources

@@ -1 +1 @@
-SHA512 (0.9.0.tar.gz) = c4accc521d3d37c191e8807764e856d84580e43e8afbec3e4a1fbc54af57abb5315ebdf4b0dfe1b5b1589027751ae0864dd1f859f0c3dd99d5694a992cfb8551
+SHA512 (0.10.1.tar.gz) = 7049c084d9bef2064ff5ad4964bf5071b2fe0553c2dfe7522b32b3a441fcdd46f718adeca63a163e95d5f86c3f092b02ffa3190822861f566b498654711c722d