Import from AlmaLinux stable repository
This commit is contained in:
parent
67fd6028c9
commit
7a8e5284ae
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/libica-4.2.3.tar.gz
|
||||
SOURCES/libica-4.4.1.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
2fdb8eaa8985f05aea287b9d6547bb5169863ae4 SOURCES/libica-4.2.3.tar.gz
|
||||
24b3121aa5ac611c0f0a0909c33eaa0315760376 SOURCES/libica-4.4.1.tar.gz
|
||||
|
||||
@ -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;
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Summary: Library for accessing ICA hardware crypto on IBM z Systems
|
||||
Name: libica
|
||||
Version: 4.2.3
|
||||
Version: 4.4.1
|
||||
Release: 1%{?dist}
|
||||
License: CPL
|
||||
URL: https://github.com/opencryptoki/
|
||||
@ -11,9 +11,8 @@ 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
|
||||
# post GA fixes
|
||||
#Patch1: %%{name}-%%{version}-fixes.patch
|
||||
BuildRequires: gcc
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: openssl
|
||||
@ -110,6 +109,22 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 16 2025 Dan Horák <dhorak@redhat.com> - 4.4.1-1
|
||||
- updated to 4.4.1 (RHEL-73347)
|
||||
- Resolves: RHEL-73347
|
||||
|
||||
* Mon Jan 06 2025 Dan Horák <dhorak@redhat.com> - 4.4.0-1
|
||||
- updated to 4.4.0 (RHEL-50087)
|
||||
- Resolves: RHEL-50087
|
||||
|
||||
* Thu Nov 07 2024 Dan Horák <dhorak@redhat.com> - 4.3.1-1
|
||||
- updated to 4.3.1 (RHEL-50087)
|
||||
- Resolves: RHEL-50087
|
||||
|
||||
* Mon May 27 2024 Dan Horák <dhorak@redhat.com> - 4.3.0-1
|
||||
- updated to 4.3.0 (RHEL-23703)
|
||||
- Resolves: RHEL-23703
|
||||
|
||||
* Fri Oct 27 2023 Dan Horák <dhorak@redhat.com> - 4.2.3-1
|
||||
- updated to 4.2.3 (RHEL-11415)
|
||||
- fix selfcheck in FIPS mode (RHEL-9918)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user