From c770e78dc53c9bb3d85529ced4747da6a4fb4a82 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 20 Nov 2024 13:26:21 +0000 Subject: [PATCH] import RHEL 10 Beta oqsprovider-0.6.1-1.el10 --- .fmf/version | 1 - .gitignore | 6 +- 01-iana-kem-only.patch | 126 ----------------------------------------- README.md | 3 - ci.fmf | 1 - gating.yaml | 9 --- oqsprovider.conf | 5 -- oqsprovider.spec | 33 ++--------- plans/ci.fmf | 24 -------- sources | 2 +- 10 files changed, 6 insertions(+), 204 deletions(-) delete mode 100644 .fmf/version delete mode 100644 01-iana-kem-only.patch delete mode 100644 README.md delete mode 100644 ci.fmf delete mode 100644 gating.yaml delete mode 100644 oqsprovider.conf delete mode 100644 plans/ci.fmf diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 2c9dc9d..95a5855 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -/0.5.0.tar.gz -/0.5.2.tar.gz -/0.5.3.tar.gz -/0.6.1.tar.gz -/0.7.0.tar.gz +0.6.1.tar.gz diff --git a/01-iana-kem-only.patch b/01-iana-kem-only.patch deleted file mode 100644 index 7d573fc..0000000 --- a/01-iana-kem-only.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -up oqs-provider-0.7.0/oqsprov/oqsprov_capabilities.c.xxx oqs-provider-0.7.0/oqsprov/oqsprov_capabilities.c ---- oqs-provider-0.7.0/oqsprov/oqsprov_capabilities.c.xxx 2024-10-24 17:53:18.851079647 +0200 -+++ oqs-provider-0.7.0/oqsprov/oqsprov_capabilities.c 2024-10-24 17:54:02.535120220 +0200 -@@ -138,122 +138,9 @@ static OQS_GROUP_CONSTANTS oqs_group_lis - static const OSSL_PARAM oqs_param_group_list[][11] = { - ///// OQS_TEMPLATE_FRAGMENT_GROUP_NAMES_START - --#ifdef OQS_ENABLE_KEM_frodokem_640_aes -- OQS_GROUP_ENTRY(frodo640aes, frodo640aes, frodo640aes, 0), -- -- OQS_GROUP_ENTRY(p256_frodo640aes, p256_frodo640aes, p256_frodo640aes, 1), -- OQS_GROUP_ENTRY(x25519_frodo640aes, x25519_frodo640aes, x25519_frodo640aes, -- 2), --#endif --#ifdef OQS_ENABLE_KEM_frodokem_640_shake -- OQS_GROUP_ENTRY(frodo640shake, frodo640shake, frodo640shake, 3), -- -- OQS_GROUP_ENTRY(p256_frodo640shake, p256_frodo640shake, p256_frodo640shake, -- 4), -- OQS_GROUP_ENTRY(x25519_frodo640shake, x25519_frodo640shake, -- x25519_frodo640shake, 5), --#endif --#ifdef OQS_ENABLE_KEM_frodokem_976_aes -- OQS_GROUP_ENTRY(frodo976aes, frodo976aes, frodo976aes, 6), -- -- OQS_GROUP_ENTRY(p384_frodo976aes, p384_frodo976aes, p384_frodo976aes, 7), -- OQS_GROUP_ENTRY(x448_frodo976aes, x448_frodo976aes, x448_frodo976aes, 8), --#endif --#ifdef OQS_ENABLE_KEM_frodokem_976_shake -- OQS_GROUP_ENTRY(frodo976shake, frodo976shake, frodo976shake, 9), -- -- OQS_GROUP_ENTRY(p384_frodo976shake, p384_frodo976shake, p384_frodo976shake, -- 10), -- OQS_GROUP_ENTRY(x448_frodo976shake, x448_frodo976shake, x448_frodo976shake, -- 11), --#endif --#ifdef OQS_ENABLE_KEM_frodokem_1344_aes -- OQS_GROUP_ENTRY(frodo1344aes, frodo1344aes, frodo1344aes, 12), -- -- OQS_GROUP_ENTRY(p521_frodo1344aes, p521_frodo1344aes, p521_frodo1344aes, -- 13), --#endif --#ifdef OQS_ENABLE_KEM_frodokem_1344_shake -- OQS_GROUP_ENTRY(frodo1344shake, frodo1344shake, frodo1344shake, 14), -- -- OQS_GROUP_ENTRY(p521_frodo1344shake, p521_frodo1344shake, -- p521_frodo1344shake, 15), --#endif --#ifdef OQS_ENABLE_KEM_kyber_512 -- OQS_GROUP_ENTRY(kyber512, kyber512, kyber512, 16), -- -- OQS_GROUP_ENTRY(p256_kyber512, p256_kyber512, p256_kyber512, 17), -- OQS_GROUP_ENTRY(x25519_kyber512, x25519_kyber512, x25519_kyber512, 18), --#endif --#ifdef OQS_ENABLE_KEM_kyber_768 -- OQS_GROUP_ENTRY(kyber768, kyber768, kyber768, 19), -- -- OQS_GROUP_ENTRY(p384_kyber768, p384_kyber768, p384_kyber768, 20), -- OQS_GROUP_ENTRY(x448_kyber768, x448_kyber768, x448_kyber768, 21), -- OQS_GROUP_ENTRY(x25519_kyber768, x25519_kyber768, x25519_kyber768, 22), -- OQS_GROUP_ENTRY(p256_kyber768, p256_kyber768, p256_kyber768, 23), --#endif --#ifdef OQS_ENABLE_KEM_kyber_1024 -- OQS_GROUP_ENTRY(kyber1024, kyber1024, kyber1024, 24), -- -- OQS_GROUP_ENTRY(p521_kyber1024, p521_kyber1024, p521_kyber1024, 25), --#endif --#ifdef OQS_ENABLE_KEM_ml_kem_512 -- OQS_GROUP_ENTRY(mlkem512, mlkem512, mlkem512, 26), -- -- OQS_GROUP_ENTRY(p256_mlkem512, p256_mlkem512, p256_mlkem512, 27), -- OQS_GROUP_ENTRY(x25519_mlkem512, x25519_mlkem512, x25519_mlkem512, 28), --#endif --#ifdef OQS_ENABLE_KEM_ml_kem_768 -- OQS_GROUP_ENTRY(mlkem768, mlkem768, mlkem768, 29), -- -- OQS_GROUP_ENTRY(p384_mlkem768, p384_mlkem768, p384_mlkem768, 30), -- OQS_GROUP_ENTRY(x448_mlkem768, x448_mlkem768, x448_mlkem768, 31), - OQS_GROUP_ENTRY(X25519MLKEM768, X25519MLKEM768, X25519MLKEM768, 32), - OQS_GROUP_ENTRY(SecP256r1MLKEM768, SecP256r1MLKEM768, SecP256r1MLKEM768, - 33), --#endif --#ifdef OQS_ENABLE_KEM_ml_kem_1024 -- OQS_GROUP_ENTRY(mlkem1024, mlkem1024, mlkem1024, 34), -- -- OQS_GROUP_ENTRY(p521_mlkem1024, p521_mlkem1024, p521_mlkem1024, 35), -- OQS_GROUP_ENTRY(p384_mlkem1024, p384_mlkem1024, p384_mlkem1024, 36), --#endif --#ifdef OQS_ENABLE_KEM_bike_l1 -- OQS_GROUP_ENTRY(bikel1, bikel1, bikel1, 37), -- -- OQS_GROUP_ENTRY(p256_bikel1, p256_bikel1, p256_bikel1, 38), -- OQS_GROUP_ENTRY(x25519_bikel1, x25519_bikel1, x25519_bikel1, 39), --#endif --#ifdef OQS_ENABLE_KEM_bike_l3 -- OQS_GROUP_ENTRY(bikel3, bikel3, bikel3, 40), -- -- OQS_GROUP_ENTRY(p384_bikel3, p384_bikel3, p384_bikel3, 41), -- OQS_GROUP_ENTRY(x448_bikel3, x448_bikel3, x448_bikel3, 42), --#endif --#ifdef OQS_ENABLE_KEM_bike_l5 -- OQS_GROUP_ENTRY(bikel5, bikel5, bikel5, 43), -- -- OQS_GROUP_ENTRY(p521_bikel5, p521_bikel5, p521_bikel5, 44), --#endif --#ifdef OQS_ENABLE_KEM_hqc_128 -- OQS_GROUP_ENTRY(hqc128, hqc128, hqc128, 45), -- -- OQS_GROUP_ENTRY(p256_hqc128, p256_hqc128, p256_hqc128, 46), -- OQS_GROUP_ENTRY(x25519_hqc128, x25519_hqc128, x25519_hqc128, 47), --#endif --#ifdef OQS_ENABLE_KEM_hqc_192 -- OQS_GROUP_ENTRY(hqc192, hqc192, hqc192, 48), -- -- OQS_GROUP_ENTRY(p384_hqc192, p384_hqc192, p384_hqc192, 49), -- OQS_GROUP_ENTRY(x448_hqc192, x448_hqc192, x448_hqc192, 50), --#endif --#ifdef OQS_ENABLE_KEM_hqc_256 -- OQS_GROUP_ENTRY(hqc256, hqc256, hqc256, 51), -- -- OQS_GROUP_ENTRY(p521_hqc256, p521_hqc256, p521_hqc256, 52), --#endif -- ///// OQS_TEMPLATE_FRAGMENT_GROUP_NAMES_END - }; - - typedef struct oqs_sigalg_constants_st { diff --git a/README.md b/README.md deleted file mode 100644 index bd6724a..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# oqsprovider - -The oqsprovider package diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 1fffe78..0000000 --- a/gating.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- !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} diff --git a/oqsprovider.conf b/oqsprovider.conf deleted file mode 100644 index c1b96cd..0000000 --- a/oqsprovider.conf +++ /dev/null @@ -1,5 +0,0 @@ -[provider_sect] -oqsprovider = oqs_sect - -[oqs_sect] -activate = 1 diff --git a/oqsprovider.spec b/oqsprovider.spec index f0202d4..f99f0cd 100644 --- a/oqsprovider.spec +++ b/oqsprovider.spec @@ -1,25 +1,20 @@ -%global oqs_version 0.7.0 -%global liboqs_min_version 0.11.0-3 +%global oqs_version 0.6.1 Name: oqsprovider Version: %{oqs_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: oqsprovider is an OpenSSL provider for quantum-safe algorithms based on liboqs License: Apache-2.0 AND MIT URL: https://github.com/open-quantum-safe/oqs-provider.git -Source0: https://github.com/open-quantum-safe/oqs-provider/archive/refs/tags/%{oqs_version}.tar.gz -Source1: oqsprovider.conf +Source: https://github.com/open-quantum-safe/oqs-provider/archive/refs/tags/%{oqs_version}.tar.gz -Patch01: 01-iana-kem-only.patch - -Requires: liboqs >= %{liboqs_min_version} +Requires: liboqs >= 0.10.1 Requires: openssl BuildRequires: ninja-build BuildRequires: cmake BuildRequires: gcc BuildRequires: liboqs-devel BuildRequires: openssl-devel -BuildRequires: liboqs >= %{liboqs_min_version} %description oqs-provider fully enables quantum-safe cryptography for KEM key @@ -43,33 +38,13 @@ OPENSSL_CONF=/dev/null ctest -V mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ossl-modules install %{_vpath_builddir}/lib/oqsprovider.so $RPM_BUILD_ROOT/%{_libdir}/ossl-modules (cd $RPM_BUILD_ROOT/%{_libdir}/ossl-modules/ && ln -s oqsprovider.so oqsprovider.so.%{oqs_version}) -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/openssl.d -install -m644 '%{SOURCE1}' \ - $RPM_BUILD_ROOT/%{_sysconfdir}/pki/tls/openssl.d/oqsprovider.conf %files %license LICENSE.txt %{_libdir}/ossl-modules/oqsprovider.so.%{oqs_version} %{_libdir}/ossl-modules/oqsprovider.so -%config(noreplace) %{_sysconfdir}/pki/tls/openssl.d/oqsprovider.conf %changelog -* Tue Oct 29 2024 Troy Dawson - 0.7.0-3 -- Bump release for October 2024 mass rebuild: - Resolves: RHEL-64018 - -* Thu Oct 24 2024 Dmitry Belyavskiy - 0.7.0-2 -- OQS provider should provide only standard groups - Resolves: RHEL-64277 - -* Thu Oct 17 2024 Dmitry Belyavskiy - 0.7.0-1 -- Rebase oqsprovider to 0.7.0 - Resolves: RHEL-56155 - -* Thu Oct 03 2024 Dmitry Belyavskiy - 0.6.1-2 -- Add drop-in configuration for oqsprovider - Resolves: RHEL-56891 - * Thu Jul 11 2024 Dmitry Belyavskiy - 0.6.1-1 - Rebase oqsprovider to 0.6.1 Resolves: RHEL-43146 diff --git a/plans/ci.fmf b/plans/ci.fmf deleted file mode 100644 index 0ed9aa8..0000000 --- a/plans/ci.fmf +++ /dev/null @@ -1,24 +0,0 @@ -/fips-disabled-buildroot-disabled: - plan: - import: - url: https://pkgs.devel.redhat.com/git/tests/oqsprovider - name: /Plans/ci/fips-disabled-buildroot-disabled - -/fips-disabled-buildroot-enabled: - plan: - import: - url: https://pkgs.devel.redhat.com/git/tests/oqsprovider - name: /Plans/ci/fips-disabled-buildroot-enabled - -/fips-enabled-buildroot-disabled: - plan: - import: - url: https://pkgs.devel.redhat.com/git/tests/oqsprovider - name: /Plans/ci/fips-enabled-buildroot-disabled - -/fips-enabled-buildroot-enabled: - plan: - import: - url: https://pkgs.devel.redhat.com/git/tests/oqsprovider - name: /Plans/ci/fips-enabled-buildroot-enabled - diff --git a/sources b/sources index 706726e..6b3ff76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.7.0.tar.gz) = 1cd7ac526d3a8550bfc19b2882ea1f4f22e523aab20811b5de82f6e42568d751455a3e498f3944e8b51df7769222c5b5f93f3f502541e0a3e1a7b863cbfd023c +SHA512 (0.6.1.tar.gz) = 4c431b20fedf6680e04a4f57d3dedad76ca606f51ddbf6e3bd90e516c65b6d20df60142f3fa68a6a0f73d5d2be7f27d82ae6929a3b73b522acfbfaef9420815a