From bd74340418f6ccac7d2f866eedb6b7aa082ae2c9 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 29 Sep 2025 09:46:42 +0000 Subject: [PATCH] import CS libica-4.4.1-1.el9 --- .gitignore | 2 +- .libica.metadata | 2 +- SOURCES/libica-4.4.0-fixes.patch | 33 -------------------------------- SPECS/libica.spec | 8 ++++++-- 4 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 SOURCES/libica-4.4.0-fixes.patch diff --git a/.gitignore b/.gitignore index ac013c9..907d8e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libica-4.4.0.tar.gz +SOURCES/libica-4.4.1.tar.gz diff --git a/.libica.metadata b/.libica.metadata index e51bfcb..9e75fca 100644 --- a/.libica.metadata +++ b/.libica.metadata @@ -1 +1 @@ -5b239ff3b7a4394a047fe4235a3ab881f7a5627e SOURCES/libica-4.4.0.tar.gz +24b3121aa5ac611c0f0a0909c33eaa0315760376 SOURCES/libica-4.4.1.tar.gz diff --git a/SOURCES/libica-4.4.0-fixes.patch b/SOURCES/libica-4.4.0-fixes.patch deleted file mode 100644 index 02df08b..0000000 --- a/SOURCES/libica-4.4.0-fixes.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ff35d0226e72251ae495913aeb758bd141a3db19 Mon Sep 17 00:00:00 2001 -From: Joerg Schmidbauer -Date: Wed, 18 Dec 2024 17:09:33 +0100 -Subject: [PATCH] Fix bug in condition logic - -This bug causes an incorrect indication of the availability of algos -in fips mode. - -Fixes: https://github.com/opencryptoki/libica/commit/a9288f578b402851d41da579a78e3cbd9d1bab98 - -Signed-off-by: Joerg Schmidbauer ---- - src/s390_crypto.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/s390_crypto.c b/src/s390_crypto.c -index 58e082a..e05c7e7 100644 ---- a/src/s390_crypto.c -+++ b/src/s390_crypto.c -@@ -709,8 +709,8 @@ int s390_get_functionlist(libica_func_list_element *pmech_list, - * approved. - * - We are in an error state. - * */ -- if (((fips & ICA_FIPS_MODE) && !fips_approved(pmech_list[x].mech_mode_id && -- !fips_override(pmech_list[x].mech_mode_id))) -+ if (((fips & ICA_FIPS_MODE) && !fips_approved(pmech_list[x].mech_mode_id) && -+ !fips_override(pmech_list[x].mech_mode_id)) - || fips >> 1) { - pmech_list[x].flags = 0; - pmech_list[x].property = 0; --- -2.47.1 - diff --git a/SPECS/libica.spec b/SPECS/libica.spec index 2611036..935f2fd 100644 --- a/SPECS/libica.spec +++ b/SPECS/libica.spec @@ -2,7 +2,7 @@ Summary: Library for accessing ICA hardware crypto on IBM z Systems Name: libica -Version: 4.4.0 +Version: 4.4.1 Release: 1%{?dist} License: CPL URL: https://github.com/opencryptoki/ @@ -12,7 +12,7 @@ Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{v # https://github.com/opencryptoki/libica/pull/24 Patch0: %{name}-4.0.0-annotate.patch # post GA fixes -Patch1: %{name}-4.4.0-fixes.patch +#Patch1: %%{name}-%%{version}-fixes.patch BuildRequires: gcc BuildRequires: openssl-devel BuildRequires: openssl @@ -109,6 +109,10 @@ fi %changelog +* Mon Jun 16 2025 Dan Horák - 4.4.1-1 +- updated to 4.4.1 (RHEL-73347) +- Resolves: RHEL-73347 + * Mon Jan 06 2025 Dan Horák - 4.4.0-1 - updated to 4.4.0 (RHEL-50087) - Resolves: RHEL-50087