packages/libkcapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the failure of testcase compiled with kernel-6.x

Browse Source
This commit is contained in:
yixiangzhike 2024-11-20 18:28:09 +08:00
parent 48b6d7fd38
commit 3592782958
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
backport-tests-fix-overly-optimistic-kernel-version-checks.patch Normal file
View File

@ -0,0 +1,43 @@
From c2af62dcc7a287f3c14f6aaec5724401c1ea470a Mon Sep 17 00:00:00 2001
From: Ondrej Mosnacek <omosnace@redhat.com>
Date: Mon, 15 Aug 2022 10:19:50 +0200
Subject: [PATCH] tests: fix overly-optimistic kernel version checks
The mainline kernel is now at version 6.0 so these >= 5.99 checks are
now incorrectly enabling tests that don't work. Instead of bumping the
imaginary version and face the same problem again in a couple years,
replace the checks with 'false' and a TODO comment.
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
test/test.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/test/test.sh b/test/test.sh
index 1d9be73..a75b802 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -1560,7 +1560,8 @@ else
echo_deact "AEAD tests of copied AAD deactivated"
fi
-if $(check_min_kernelver 5 99); then
+# TODO add version check when supported upstream
+if false; then
asymfunc 4
asymfunc 4 -s
asymfunc 4 -v
@@ -1583,7 +1584,8 @@ else
echo_deact "All asymmetric tests deactivated"
fi
-if $(check_min_kernelver 5 99); then
+# TODO add version check when supported upstream
+if false; then
kppfunc 13
kppfunc 13 X -m
kppfunc 13 -v
--
2.33.0

9
libkcapi.spec
View File

@ -24,7 +24,7 @@ ln -s libkcapi.so.%{version}.hmac %{buildroot}/%{_lib}/fipscheck/libkcapi.so.
Name: libkcapi
Version: 1.4.0
Release: 6
Release: 7
Summary: libkcapi - Linux Kernel Crypto API User Space Interface Library
License: BSD or GPLv2
@ -35,6 +35,7 @@ Source1: http://www.chronox.de/%{name}/%{name}-%{version}.tar.xz.asc
Patch0: libkcapi-1.1.1-lib_Fix_kcapi_handle_destroy_closing_FD_0.patch
Patch1: backport-Append-newline-to-stdout.patch
Patch2: backport-Prevent-cppcheck-from-defining-CHECK_DIR.patch
Patch3: backport-tests-fix-overly-optimistic-kernel-version-checks.patch
BuildRequires: clang coreutils cppcheck gcc hardlink
BuildRequires: libtool openssl perl systemd xmlto kernel-headers >= 4.10.0
@ -219,6 +220,12 @@ popd
%{_mandir}/man3/kcapi_*.3.*
%changelog
* Wed Nov 20 2024 yixiangzhike <yixiangzhike007@163.com> - 1.4.0-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix the failure of testcase compiled with kernel-6.x
* Thu Jan 18 2024 yixiangzhike <yixiangzhike007@163.com> - 1.4.0-6
- Type:bugfix
- ID:NA