Compare commits
No commits in common. "c10-beta" and "c10s" have entirely different histories.
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
6
.gitignore
vendored
6
.gitignore
vendored
@ -1 +1,5 @@
|
||||
0.10.1.tar.gz
|
||||
/0.8.0.tar.gz
|
||||
/0.9.0.tar.gz
|
||||
/0.9.2.tar.gz
|
||||
/0.10.1.tar.gz
|
||||
/0.11.0.tar.gz
|
||||
|
9
gating.yaml
Normal file
9
gating.yaml
Normal file
@ -0,0 +1,9 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-enabled.functional}
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-disabled.functional}
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-enabled.functional}
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-disabled.functional}
|
File diff suppressed because it is too large
Load Diff
14
liboqs-0.10.0-std-stricter.patch
Normal file
14
liboqs-0.10.0-std-stricter.patch
Normal file
@ -0,0 +1,14 @@
|
||||
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 "NIST_2024")
|
||||
+##### 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_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")
|
||||
elseif(${OQS_ALGS_ENABLED} STREQUAL "NIST_SIG_ONRAMP")
|
43
liboqs-0.11.0-acvp_patch.patch
Normal file
43
liboqs-0.11.0-acvp_patch.patch
Normal file
@ -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)
|
27
liboqs.spec
27
liboqs.spec
@ -1,7 +1,7 @@
|
||||
%global oqs_version 0.10.1
|
||||
%global oqs_version 0.11.0
|
||||
Name: liboqs
|
||||
Version: %{oqs_version}
|
||||
Release: 2%{?dist}
|
||||
Release: 4%{?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,8 @@ 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-stricter.patch
|
||||
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: cmake
|
||||
@ -61,7 +62,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 -DOQS_DLOPEN_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=NIST_2024 -DOQS_USE_SHA3_OPENSSL=ON -DOQS_DLOPEN_OPENSSL=ON -DCMAKE_BUILD_TYPE=Debug -LAH ..
|
||||
%cmake_build
|
||||
#ninja gen_docs
|
||||
|
||||
@ -81,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
|
||||
@ -98,6 +99,22 @@ done
|
||||
#%doc %%{_datadir}/doc/oqs/xml/*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.11.0-4
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Thu Oct 24 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 0.11.0-3
|
||||
- Restoring ML-KEM-512 built out by accident
|
||||
Resolves: RHEL-64284
|
||||
|
||||
* Fri Oct 04 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 0.11.0-2
|
||||
- Removing Falcon from supported algorithms
|
||||
Related: RHEL-56152
|
||||
|
||||
* Mon Sep 30 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 0.11.0-1
|
||||
- Update to 0.11.0 version
|
||||
Resolves: RHEL-56152
|
||||
|
||||
* Mon Jul 08 2024 Dmitry Belyavskiy - 0.10.1-1
|
||||
- Rebase to 0.10.1 version (CVE-2024-36405)
|
||||
Resolves: RHEL-40699
|
||||
|
24
plans/ci.fmf
Normal file
24
plans/ci.fmf
Normal file
@ -0,0 +1,24 @@
|
||||
/fips-disabled-buildroot-disabled:
|
||||
plan:
|
||||
import:
|
||||
url: https://pkgs.devel.redhat.com/git/tests/liboqs
|
||||
name: /Plans/ci/fips-disabled-buildroot-disabled
|
||||
|
||||
/fips-disabled-buildroot-enabled:
|
||||
plan:
|
||||
import:
|
||||
url: https://pkgs.devel.redhat.com/git/tests/liboqs
|
||||
name: /Plans/ci/fips-disabled-buildroot-enabled
|
||||
|
||||
/fips-enabled-buildroot-disabled:
|
||||
plan:
|
||||
import:
|
||||
url: https://pkgs.devel.redhat.com/git/tests/liboqs
|
||||
name: /Plans/ci/fips-enabled-buildroot-disabled
|
||||
|
||||
/fips-enabled-buildroot-enabled:
|
||||
plan:
|
||||
import:
|
||||
url: https://pkgs.devel.redhat.com/git/tests/liboqs
|
||||
name: /Plans/ci/fips-enabled-buildroot-enabled
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (0.10.1.tar.gz) = 7049c084d9bef2064ff5ad4964bf5071b2fe0553c2dfe7522b32b3a441fcdd46f718adeca63a163e95d5f86c3f092b02ffa3190822861f566b498654711c722d
|
||||
SHA512 (0.11.0.tar.gz) = 10dc002f148895cc304d6b0db14734d9149aeae43308caee4fe5c39ee18fbd7297c65f5c67df0a39b84534f676f209bbcda591b353128b4bab152cb69177c6ae
|
||||
|
Loading…
Reference in New Issue
Block a user