diff --git a/openssl-ibmca-2.2.0-eckey.patch b/openssl-ibmca-2.2.0-eckey.patch deleted file mode 100644 index 6e8d490..0000000 --- a/openssl-ibmca-2.2.0-eckey.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 34965d85fecd73bbd750e63a29d6db743759d240 Mon Sep 17 00:00:00 2001 -From: Juergen Christ -Date: Mon, 31 May 2021 18:00:07 +0200 -Subject: [PATCH] Skip eckey test if needed. - -Without crypto cards on a machine < z15, ibmca might not register with the -EC_KEY subsystem of OpenSSL. In these cases, the eckey test should be skipped -since it is doomed to fail. - -Fixes #69. - -Signed-off-by: Juergen Christ ---- - test/eckey.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/test/eckey.c b/test/eckey.c -index 35b3df2..6d0870b 100644 ---- a/test/eckey.c -+++ b/test/eckey.c -@@ -44,6 +44,10 @@ int check_eckey(int nid, const char *name) - fprintf(stderr, "ibmca engine not loaded\n"); - goto out; - } -+ if (ENGINE_get_EC(engine) == NULL) { -+ fprintf(stderr, "ibmca does not support EC_KEY. Skipping...\n"); -+ exit(77); -+ } - eckey = EC_KEY_new_by_curve_name(nid); - if (eckey == NULL) { - /* curve not supported => test passed */ diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec index f0abef2..1def9a8 100644 --- a/openssl-ibmca.spec +++ b/openssl-ibmca.spec @@ -2,13 +2,11 @@ Summary: A dynamic OpenSSL engine for IBMCA Name: openssl-ibmca -Version: 2.2.0 -Release: 2%{?dist} +Version: 2.2.1 +Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/opencryptoki Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -# https://github.com/opencryptoki/openssl-ibmca/commit/34965d85fecd73bbd750e63a29d6db743759d240 -Patch0: openssl-ibmca-2.2.0-eckey.patch Requires: libica >= 3.8.0 BuildRequires: make BuildRequires: gcc @@ -57,6 +55,9 @@ make check %changelog +* Tue Sep 14 2021 Dan HorĂ¡k - 2.2.1-1 +- updated to 2.2.1 + * Thu Jul 22 2021 Fedora Release Engineering - 2.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 780b75b..9e119df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openssl-ibmca-2.2.0.tar.gz) = 1e88c1726a6473045e46fbd8f0edc8c95cb5c6794b9d3535871bdc0cada28392b392b5e0bc96d9cb152b20501e2c60abf8ac5d0df5f4081e64768abea7a818f5 +SHA512 (openssl-ibmca-2.2.1.tar.gz) = c60a8e00c43b5428208af238a8fc0e4839b5293babfe0a7007939a105ade43322888d56a8284f90ce425c1e706fec424b5ce335633ef9fdb3cd06c8b33c32560