From b62310e450e6d2a1c2903dd4c8f8db0cefcdfcba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Wed, 31 Jan 2024 15:49:02 +0000
Subject: [PATCH] - updated to 4.3.0

---
 libica-4.2.3-fips.patch | 35 -----------------------------------
 libica.spec             | 10 +++++-----
 sources                 |  2 +-
 3 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 libica-4.2.3-fips.patch

diff --git a/libica-4.2.3-fips.patch b/libica-4.2.3-fips.patch
deleted file mode 100644
index 5bddfb9..0000000
--- a/libica-4.2.3-fips.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ee365a11a4acc667c7a726fbdc3447ba550309b6 Mon Sep 17 00:00:00 2001
-From: Joerg Schmidbauer <jschmidb@de.ibm.com>
-Date: Tue, 10 Oct 2023 14:10:22 +0200
-Subject: [PATCH] fips: use openssl lib context in compute_file_hmac
-
-Before calling any openssl EVP function, libica's own openssl lib ctx
-must be made the current one. This was missing in compute_file_hmac.
-
-Suggested-by: Ingo Franzki <ifranzki@linux.ibm.com>
-Signed-off-by: Joerg Schmidbauer <jschmidb@de.ibm.com>
----
- src/fips.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/fips.c b/src/fips.c
-index f09dc77..3bbc325 100644
---- a/src/fips.c
-+++ b/src/fips.c
-@@ -400,6 +400,8 @@ static int compute_file_hmac(const char *path, void **buf, size_t *hmaclen)
- 	void *fdata = NULL;
- 	struct stat fdata_stat;
- 
-+	BEGIN_OPENSSL_LIBCTX(openssl_libctx, rc);
-+
- 	pkey = get_pkey();
- 	if (!pkey)
- 		goto end;
-@@ -438,6 +440,7 @@ static int compute_file_hmac(const char *path, void **buf, size_t *hmaclen)
- 		EVP_MD_CTX_destroy(mdctx);
- 
- 	OPENSSL_cleanse(tmp, sizeof(tmp));
-+	END_OPENSSL_LIBCTX(rc);
- 
- 	return rc;
- }
diff --git a/libica.spec b/libica.spec
index 8942cdb..d63d19c 100644
--- a/libica.spec
+++ b/libica.spec
@@ -2,8 +2,8 @@
 
 Summary: Library for accessing ICA hardware crypto on IBM z Systems
 Name: libica
-Version: 4.2.3
-Release: 4%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
 License: CPL-1.0
 URL: https://github.com/opencryptoki/
 Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -11,9 +11,6 @@ Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{v
 # https://bugzilla.redhat.com/show_bug.cgi?id=1630582
 # https://github.com/opencryptoki/libica/pull/24
 Patch0: %{name}-4.0.0-annotate.patch
-# https://issues.redhat.com/browse/RHEL-9918
-# https//github.com/opencryptoki/libica/commit/ee365a11a4acc667c7a726fbdc3447ba550309b6
-Patch1: %{name}-4.2.3-fips.patch
 BuildRequires: gcc
 BuildRequires: openssl-devel
 BuildRequires: openssl
@@ -110,6 +107,9 @@ fi
 
 
 %changelog
+* Wed Jan 31 2024 Dan Horák <dan[at]danny.cz> - 4.3.0-1
+- updated to 4.3.0
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 5ee2876..dafcd06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libica-4.2.3.tar.gz) = c370151bfddf58f397932b294394e50db3f6c61a2114315ba3176b8aaeb34253561192c717ca01185371715e9f008fa0ceee8e7ffc559377a51a67f4d47ae035
+SHA512 (libica-4.3.0.tar.gz) = 0952e0c7005756faf90cccf824cf5d3c22a45076008edb0622030ca148dbacb8752e6ece5b22b06b877ca7038ecca3e1c26ab66bc19328ed36784320ec27071d