From b26143ee4e695d8e83dd64250210a41e043aeccc Mon Sep 17 00:00:00 2001
From: Dmitry Belyavskiy <dbelyavs@redhat.com>
Date: Thu, 17 Oct 2024 15:10:15 +0200
Subject: [PATCH] Rebase oqsprovider to 0.7.0

Resolves: RHEL-56155
---
 .gitignore           |  1 +
 01-nosha1-test.patch | 12 ------------
 oqsprovider.spec     | 10 ++++++----
 sources              |  2 +-
 4 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 01-nosha1-test.patch

diff --git a/.gitignore b/.gitignore
index 340afed..2c9dc9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /0.5.2.tar.gz
 /0.5.3.tar.gz
 /0.6.1.tar.gz
+/0.7.0.tar.gz
diff --git a/01-nosha1-test.patch b/01-nosha1-test.patch
deleted file mode 100644
index 73299e0..0000000
--- a/01-nosha1-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up oqs-provider-0.6.1/test/tlstest_helpers.c.xxx oqs-provider-0.6.1/test/tlstest_helpers.c
---- oqs-provider-0.6.1/test/tlstest_helpers.c.xxx	2024-10-03 17:54:19.127349786 +0200
-+++ oqs-provider-0.6.1/test/tlstest_helpers.c	2024-10-03 17:54:28.356566812 +0200
-@@ -28,7 +28,7 @@ int create_cert_key(OSSL_LIB_CTX *libctx
-         || !X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC,
-                                        (unsigned char *)"localhost", -1, -1, 0)
-         || !X509_set_issuer_name(x509, name)
--        || !X509_sign(x509, pkey, EVP_sha1())
-+        || !X509_sign(x509, pkey, EVP_sha256())
-         || !(keybio = BIO_new_file(privkeyfilename, "wb"))
-         || !PEM_write_bio_PrivateKey(keybio, pkey, NULL, NULL, 0, NULL, NULL)
-         || !(certbio = BIO_new_file(certfilename, "wb"))
diff --git a/oqsprovider.spec b/oqsprovider.spec
index f20569f..16fec82 100644
--- a/oqsprovider.spec
+++ b/oqsprovider.spec
@@ -1,8 +1,8 @@
-%global oqs_version 0.6.1
+%global oqs_version 0.7.0
 %global liboqs_min_version 0.11.0
 Name:       oqsprovider
 Version:    %{oqs_version}
-Release:    2%{?dist}
+Release:    1%{?dist}
 Summary:    oqsprovider is an OpenSSL provider for quantum-safe algorithms based on liboqs
 
 License:    Apache-2.0 AND MIT
@@ -10,8 +10,6 @@ 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
 
-Patch1:	    01-nosha1-test.patch
-
 Requires: liboqs >= %{liboqs_min_version}
 Requires: openssl
 BuildRequires: ninja-build
@@ -54,6 +52,10 @@ install -m644 '%{SOURCE1}' \
 %config(noreplace) %{_sysconfdir}/pki/tls/openssl.d/oqsprovider.conf
 
 %changelog
+* Thu Oct 17 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 0.7.0-1
+- Rebase oqsprovider to 0.7.0
+  Resolves: RHEL-56155
+
 * Thu Oct 03 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 0.6.1-2
 - Add drop-in configuration for oqsprovider
   Resolves: RHEL-56891
diff --git a/sources b/sources
index 6b3ff76..706726e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (0.6.1.tar.gz) = 4c431b20fedf6680e04a4f57d3dedad76ca606f51ddbf6e3bd90e516c65b6d20df60142f3fa68a6a0f73d5d2be7f27d82ae6929a3b73b522acfbfaef9420815a
+SHA512 (0.7.0.tar.gz) = 1cd7ac526d3a8550bfc19b2882ea1f4f22e523aab20811b5de82f6e42568d751455a3e498f3944e8b51df7769222c5b5f93f3f502541e0a3e1a7b863cbfd023c