diff --git a/libica-no-fips-config.patch b/libica-no-fips-config.patch deleted file mode 100644 index 04a4885..0000000 --- a/libica-no-fips-config.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 56b6ca219ecd37ba2c7e520ddac83eb801ce76ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Mon, 16 May 2022 15:44:06 +0200 -Subject: [libica PATCH] FIPS specific openssl config is not required in - RHEL/Fedora - ---- - src/fips.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/fips.c b/src/fips.c -index 129a1a7..6466133 100644 ---- a/src/fips.c -+++ b/src/fips.c -@@ -235,12 +235,15 @@ fips_init(void) - FIPS_mode_set(1); - #else - fips = 0; -+ /* FIPS specific openssl config is not required in RHEL/Fedora */ -+#if 0 - if (!OSSL_LIB_CTX_load_config(openssl_libctx, LIBICA_FIPS_CONFIG)) { - syslog(LOG_ERR, "Libica failed to load openssl fips config %s\n", - LIBICA_FIPS_CONFIG); - fips |= ICA_FIPS_INTEGRITY; - return; - } -+#endif - - openssl_provider = OSSL_PROVIDER_load(openssl_libctx, "fips"); - if (openssl_provider == NULL) { --- -2.34.3 - diff --git a/libica.spec b/libica.spec index ab6ad0d..20cf2b8 100644 --- a/libica.spec +++ b/libica.spec @@ -2,7 +2,7 @@ Summary: Library for accessing ICA hardware crypto on IBM z Systems Name: libica -Version: 4.0.3 +Version: 4.1.0 Release: 1%{?dist} License: CPL URL: https://github.com/opencryptoki/ @@ -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 -# FIPS openssl config is not needed on RHEL/Fedora -# https://bugzilla.redhat.com/show_bug.cgi?id=2084097 -Patch1: %{name}-no-fips-config.patch BuildRequires: gcc BuildRequires: openssl-devel BuildRequires: openssl @@ -49,6 +46,10 @@ sh ./bootstrap.sh %build +# FIPS openssl config is not needed on RHEL/Fedora +# https://bugzilla.redhat.com/show_bug.cgi?id=2084097 +CPPFLAGS=-DNO_FIPS_CONFIG_LOAD +export CPPFLAGS %configure --disable-static \ %if %{with_fips} --enable-fips @@ -106,6 +107,9 @@ fi %changelog +* Fri Sep 30 2022 Dan Horák - 4.1.0-1 +- updated to 4.1.0 + * Tue Aug 16 2022 Dan Horák - 4.0.3-1 - updated to 4.0.3 diff --git a/sources b/sources index 753983e..b722c35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libica-4.0.3.tar.gz) = 19b6267c68e0c4b70ad9690bd7615ee2c082f3f08a2275dc9abece16207abff0136e973eab668d8698e7f1d647e945646f1c19939f1f4afe764d9b0283dd9d35 +SHA512 (libica-4.1.0.tar.gz) = e6a89b894263fc16a36675609cf477bdf00138695b4886f12be034f7b83607efe76fefbe70d3e7e0e098c162679ec08809cd83dce6799e39636963847ce0fa05