rpms
/
ima-evm-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import ima-evm-utils-1.1-5.el8

This commit is contained in:
CentOS Sources 2019-11-05 15:20:31 -05:00 committed by Andrew Lukoshko
parent de05ba5722
commit 039bbeb9d8
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
SOURCES/libimaevm-keydesc-import.patch Normal file
View File

@ -0,0 +1,37 @@
diff --git a/src/libimaevm.c b/src/libimaevm.c
index 6fa0ed4..b6f9b9f 100644
--- a/src/libimaevm.c
+++ b/src/libimaevm.c
@@ -672,12 +672,11 @@ void calc_keyid_v1(uint8_t *keyid, char *str, const unsigned char *pkey, int len
memcpy(keyid, sha1 + 12, 8);
log_debug("keyid: ");
log_debug_dump(keyid, 8);
+ id = __be64_to_cpup((__be64 *) keyid);
+ sprintf(str, "%llX", (unsigned long long)id);
- if (params.verbose > LOG_INFO) {
- id = __be64_to_cpup((__be64 *) keyid);
- sprintf(str, "%llX", (unsigned long long)id);
+ if (params.verbose > LOG_INFO)
log_info("keyid-v1: %s\n", str);
- }
}
void calc_keyid_v2(uint32_t *keyid, char *str, RSA *key)
@@ -694,11 +693,10 @@ void calc_keyid_v2(uint32_t *keyid, char *str, RSA *key)
memcpy(keyid, sha1 + 16, 4);
log_debug("keyid: ");
log_debug_dump(keyid, 4);
+ sprintf(str, "%x", __be32_to_cpup(keyid));
- if (params.verbose > LOG_INFO) {
- sprintf(str, "%x", __be32_to_cpup(keyid));
+ if (params.verbose > LOG_INFO)
log_info("keyid: %s\n", str);
- }
free(pkey);
}
--
2.19.1

7
SPECS/ima-evm-utils.spec
View File

@ -1,7 +1,7 @@
Summary: IMA/EVM support utilities
Name: ima-evm-utils
Version: 1.1
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2
Url: http://linux-ima.sourceforge.net/
Source: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz
@ -10,6 +10,7 @@ BuildRequires: openssl-devel libattr-devel keyutils-libs-devel
Patch1: docbook-xsl-path.patch
Patch2: covscan-memory-leaks.patch
Patch3: annocheck-opt-flag.patch
Patch4: libimaevm-keydesc-import.patch
%description
The Trusted Computing Group(TCG) run-time Integrity Measurement Architecture
@ -30,6 +31,7 @@ This package provides the header files for %{name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
mkdir -p m4
@ -56,6 +58,9 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete
%{_mandir}/man1/*
%changelog
* Thu Mar 28 2019 Bruno E. O. Meneguele <bmeneg@redhat.com> - 1.1-5
- Add patch to correctly handle key description on keyring during importation
* Mon Oct 29 2018 Bruno E. O. Meneguele <bmeneg@redhat.com> - 1.1-4
- Solve a single memory leak not handled by the last patch