Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

- Ship kcapi-hasher manpage in libkcapi-hasher

Signed-off-by: Ondrej Mosnáček <omosnacek@gmail.com>

.fmf/version

@@ -0,0 +1 @@
+1

001-fix-fuzz-test.patch

@@ -1,37 +0,0 @@
-From e8c22fe01c6dd46399396694cd1d72a6988dc287 Mon Sep 17 00:00:00 2001
-From: Ondrej Mosnacek <omosnace@redhat.com>
-Date: Sat, 27 Mar 2021 13:46:45 +0100
-Subject: [PATCH] kcapi: Fix hang in fuzz tests with recent kernels
-
-After kernel commit f3c802a1f300 ("crypto: algif_aead - Only wake up
-when..."), the fuzz tests hang indefinitely, because they request more
-output data than the operation can produce. Fix this by requesting at
-most the expected size of the output data.
-
-Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
----
- test/kcapi-main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/kcapi-main.c b/test/kcapi-main.c
-index 64e466c..975e8d1 100644
---- a/test/kcapi-main.c
-+++ b/test/kcapi-main.c
-@@ -380,7 +380,7 @@ static int fuzz_cipher(struct kcapi_cavs *cavs_test, unsigned long flags,
- 	}
- 
- 	for (i = 0; i < sizeof(indata); i++) {
--		unsigned int outlen = sizeof(outdata);
-+		unsigned int outlen = i;
- 		uint8_t *out = outdata;
- 		uint8_t *iv = indata;
- 		uint8_t *in = indata;
-@@ -474,7 +474,7 @@ static int fuzz_aead(struct kcapi_cavs *cavs_test, unsigned long flags,
- 	}
- 
- 	for (i = 0; i < sizeof(indata); i++) {
--		unsigned int outlen = sizeof(outdata);
-+		unsigned int outlen = i;
- 		uint8_t *out = outdata;
- 		uint8_t *iv = indata;
- 		uint8_t *in = indata;

changelog

@@ -0,0 +1,247 @@
+* Sat Aug 13 2022 Ondrej Mosnáček <omosnace@redhat.com> - 1.4.0-2
+- Switch to rpmautospec
+
+* Sat Aug 13 2022 Ondrej Mosnáček <omosnace@redhat.com> - 1.4.0-1
+- Update to upstream version 1.4.0
+- Re-enable cppcheck scanning on Fedora
+- Resolves: rhbz#2056732
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 14 2021 Simo Sorce <simo@redhat.com> - 1.3.1-2
+- Remove LTO build suppression by using better symver machinery
+
+* Wed Jul 14 2021 Simo Sorce <simo@redhat.com> - 1.3.1-1
+- Update to upstream version 1.3.1 which fixes ABI issues
+
+* Mon Jul 12 2021 Simo Sorce <simo@redhat.com> - 1.3.0-1
+- Update to upstream version 1.3.0
+
+* Mon Mar 15 2021 Sahana Prasad <sahana@redhat.com> - 1.2.1-1
+- Update to upstream version 1.2.1
+- Remove patch fix MSG_MORE uasge as it is added upstream
+- Remove cppcheck dependency for rhel bz#1931518
+- Add a patch to fix fuzz tests
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Aug 14 2020 Ondrej Mosnáček <omosnace@redhat.com> - 1.2.0-3
+- Require perl-interpreter instead of full perl
+- Backport fix for 5.9 kernels
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 25 2020 Sahana Prasad <omosnace@redhat.com> - 1.2.0-1
+- Update to upstream version 1.2.0 tracked by BZ 1839592.
+- Enable kcapi-enc tests as libkcapi BZ 1826022 is fixed.
+- Remove 110-fipshmac-compat.patch as the changes are merged upstream.
+- Remove 100-workaround-cppcheck-bug.patch as the changes are merged upstream.
+
+* Tue May 05 2020 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.5-5
+- Fix the CI test failures
+- Enable building on old kernels
+- Avoid conflicts between different versions of packages
+
+* Thu Apr 23 2020 Tomáš Mráz <tmraz@redhat.com> - 1.1.5-4
+- Add . prefix to files created by fipshmac if -d option is not specified
+
+* Wed Apr 22 2020 Sahana Prasad <sahana@redhat.com> - 1.1.5-3
+- Disables kcapi-enc tests until the kernel bug bz 1826022 is fixed.
+- Produce also the fipscheck replacement package
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Aug 13 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.5-1
+- Update to upstream version 1.1.5
+
+* Sat Jul 27 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-6
+- Backport patch to fix test failure on aarch64
+- Remove no longer needed ppc64 workaround
+
+* Sat Jul 27 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-5
+- Backport patch to fix tests
+
+* Thu Jul 25 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-4
+- Work around cppcheck issue
+- Enable gating
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 27 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-2
+- Fix FTBFS: hardlink is now in bindir
+
+* Sat Feb 02 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-1
+- Update to upstream version 1.1.4
+
+* Fri Feb 01 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.3-3
+- Fix build with new GCC
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Aug 23 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.3-1
+- Update to upstream version 1.1.3
+
+* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-16
+- Add missing dependencies to the tests package
+- Update patch from upstream
+
+* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-15
+- Build and tests require perl
+
+* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-14
+- Add missing script to the 'tests' package
+
+* Wed Aug 08 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-13
+- Add missing requires to the 'tests' subpackage
+
+* Tue Aug 07 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-12
+- Produce a subpackage with test scripts
+- Build the 'tests' subpackage conditionally
+
+* Wed Aug 01 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-11
+- Add patch to fix unwanted closing of FD 0
+
+* Tue Jul 31 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-10
+- Remove the kernel headers workaround
+
+* Fri Jul 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.1-9
+- Rebuild for new binutils
+
+* Fri Jul 27 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-8
+- Add more Coverity fixes from upstream
+- Add patch to fix AEAD fuzz test for BE arches
+- Fixup specfile
+
+* Mon Jul 23 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-7
+- Add various fixes from upstream
+- Drop the Requires on kernel package
+
+* Mon Jul 16 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-6
+- Put .hmac files into a separate directory
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul 12 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-4
+- Add patch to work around FTBFS on rawhide
+
+* Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-3
+- Fix off-by-one error in checkfile parsing
+
+* Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-2
+- Fix command-line parsing in libkcapi-hmaccalc
+
+* Mon Jun 18 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-1
+- Update to upstream version 1.1.1
+
+* Wed May 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.0-5
+- Skip CLang static analysis in RHEL
+- Revert "Skip CLang static analysis in RHEL"
+- Use own sha512hmac and fipscheck
+
+* Wed May 02 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.0-4
+- Fix description lines being too long
+
+* Fri Apr 27 2018 Björn Esser <besser82@fedoraproject.org> - 1.1.0-3
+- Fix conditional for hmaccalc replacement
+
+* Mon Apr 16 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.0-2
+- Enable hmaccalc replacements in Fedora 28+
+
+* Thu Apr 12 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.0-1
+- Update to upstream version 1.1.0
+
+* Sat Mar 31 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-10
+- Replace single patches with a monolitic one from upstream
+- Obsolete replacements subpackage
+- Ignore failing tests on %%{power64} temporarily
+
+* Thu Mar 08 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.0.3-9
+- Split up the replacements subpackage
+
+* Mon Feb 26 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-8
+- Increase optmem_max preset to 81920
+
+* Mon Feb 26 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-7
+- Obsoletes work by package name, not by provides (rhbz#1537225)
+
+* Sun Feb 25 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-6
+- Add patch to fix a copy-paste typo
+
+* Sat Feb 17 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-5
+- Add patch to fix build with -Werror
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Feb 04 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-3
+- Switch to %%ldconfig_scriptlets
+
+* Wed Jan 17 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-2
+- Decrease optmem_max preset to 40960
+- Let the build fail, if the minimum kernel version cannot be met
+- Conditionalize the sysctl.d tweak on version of the kernel
+- Conditionalize the name of README.distro on the distro
+
+* Tue Jan 16 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-1
+- Initial import (rhbz#1533929)
+
+* Tue Jan 16 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.13
+- Increase optmem_max preset to 81920
+
+* Tue Jan 16 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.12
+- Add sysctl.d preset and README.fedora
+
+* Mon Jan 15 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.11
+- Make the contents of the -replacements package configurable
+
+* Mon Jan 15 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.10
+- Fix Obsoletes of the -replacements package
+
+* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.9
+- Disable the -replacements package until we have a plan for it
+
+* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.8
+- Move the kcapi-hasher binary to -replacements package, since it is
+  not of much use without the linked invocation names and saves the
+  extra Requires on the -tools package
+
+* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.7
+- Fix internal Requires of sub-packages
+- Hardlink files in %%{_bindir}
+
+* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.6
+- Add patches from upstream
+
+* Sat Jan 13 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.5
+- Add patches from upstream
+
+* Sat Jan 13 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.4
+- Asume the testsuite cannot be run, if the value of optmem_max cannot
+  be obtained
+
+* Sat Jan 13 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.3
+- Move libraries to /%%{_lib} instead of %%{_libdir}, which is useful
+  during boot when the library might be needed before a potentially
+  seperate /usr partition is mounted
+
+* Sat Jan 13 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.2
+- Asume optmem_max is at least 20480, if the real value cannot be obtained
+
+* Fri Jan 12 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.1
+- New upstream release
+
+* Wed Jan 10 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.2-0.1
+- Initial rpm release (rhbz#1533929)

libkcapi.spec

@@ -1,7 +1,7 @@
 # Shared object version of libkcapi.
 %global vmajor            1
-%global vminor            2
-%global vpatch            1
+%global vminor            5
+%global vpatch            0
 
 # Do we build the replacements packages?
 %bcond_with replace_coreutils
@@ -26,9 +26,7 @@
 %if 0%{?rhel}
 %bcond_with cppcheck
 %else
-# Temporarily disable cppcheck on Fedora until bz#1923600 is fixed in rawhide
-%bcond_with cppcheck
-#bcond_without cppcheck
+%bcond_without cppcheck
 %endif
 
 # Use `--without test` to build without running the tests
@@ -86,8 +84,9 @@
 %global hmaccalc_evr      0.9.14-10%{?dist}
 %endif
 
-%global apps_hmaccalc sha1hmac sha224hmac sha256hmac sha384hmac sha512hmac
-%global apps_fipscheck sha1sum sha224sum sha256sum sha384sum sha512sum md5sum fipscheck fipshmac
+%global apps_coreutils sha1sum sha224sum sha256sum sha384sum sha512sum md5sum sm3sum
+%global apps_hmaccalc sha1hmac sha224hmac sha256hmac sha384hmac sha512hmac sm3hmac
+%global apps_fipscheck fipscheck fipshmac
 
 # On old kernels use mock hashers implemented via openssl
 %if %{lua:print(rpm.vercmp(posix.uname('%r'), '3.19'));} >= 0
@@ -98,45 +97,35 @@
 %global fipshmac   bash %{SOURCE3}
 %endif
 
-# Add generation of HMAC checksums of the final stripped
-# binaries.  %%define with lazy globbing is used here
+# Add generation of HMAC checksum of the final stripped
+# binary.  %%define with lazy globbing is used here
 # intentionally, because using %%global does not work.
 %define __spec_install_post                                      \
 %{?__debug_package:%{__debug_install_post}}                      \
 %{__arch_install_post}                                           \
 %{__os_install_post}                                             \
 bin_path=%{buildroot}%{_bindir}                                  \
-lib_path=%{buildroot}/%{_lib}                                    \
-for app in %{apps_hmaccalc}; do                                  \
-  test -e "$bin_path"/$app || continue                           \
-  { %sha512hmac "$bin_path"/$app || exit 1; }                    \\\
-    | cut -f 1 -d ' ' >"$lib_path"/hmaccalc/$app.hmac            \
-done                                                             \
-for app in %{apps_fipscheck}; do                                 \
-  test -e "$bin_path"/$app || continue                           \
-  %fipshmac -d "$lib_path"/fipscheck "$bin_path"/$app || exit 1  \
-done                                                             \
-%{_bindir}/hardlink -cfv %{buildroot}%{_bindir}                  \
-%fipshmac -d "$lib_path"/fipscheck                               \\\
-  "$lib_path"/libkcapi.so.%{version} || exit 1                   \
+lib_path=%{buildroot}%{_libdir}                                  \
+{ %sha512hmac "$bin_path"/kcapi-hasher || exit 1; } |            \\\
+  cut -f 1 -d ' ' >"$lib_path"/hmaccalc/kcapi-hasher.hmac        \
+{ %sha512hmac "$lib_path"/libkcapi.so.%{version} || exit 1; } |  \\\
+  cut -f 1 -d ' ' >"$lib_path"/hmaccalc/libkcapi.so.%{version}.hmac \
 %{__ln_s} libkcapi.so.%{version}.hmac                            \\\
-  "$lib_path"/fipscheck/libkcapi.so.%{vmajor}.hmac               \
+  "$lib_path"/hmaccalc/libkcapi.so.%{vmajor}.hmac                \
 %{nil}
 
 Name:           libkcapi
 Version:        %{vmajor}.%{vminor}.%{vpatch}
-Release:        1%{?dist}
+Release:        %autorelease
 Summary:        User space interface to the Linux Kernel Crypto API
 
-License:        BSD or GPLv2
-URL:            https://www.chronox.de/%{name}.html
-Source0:        https://www.chronox.de/%{name}/%{name}-%{version}.tar.xz
-Source1:        https://www.chronox.de/%{name}/%{name}-%{version}.tar.xz.asc
+License:        BSD-3-Clause OR GPL-2.0-only
+URL:            https://www.chronox.de/%{name}/
+Source0:        https://www.chronox.de/%{name}/releases/%{version}/%{name}-%{version}.tar.xz
+Source1:        https://www.chronox.de/%{name}/releases/%{version}/%{name}-%{version}.tar.xz.asc
 Source2:        sha512hmac-openssl.sh
 Source3:        fipshmac-openssl.sh
 
-Patch001:       %{giturl}/pull/110.patch#/001-fix-fuzz-test.patch
-
 BuildRequires:  bash
 BuildRequires:  coreutils
 BuildRequires:  gcc
@@ -156,7 +145,7 @@ BuildRequires:  docbook-utils-pdf
 BuildRequires:  clang
 %endif
 %if %{with cppcheck}
-BuildRequires:  cppcheck
+BuildRequires:  cppcheck >= 2.4
 %endif
 
 # For ownership of %%{_sysctldir}.
@@ -201,10 +190,18 @@ User documentation for %{name}.
 %endif
 
 
+%package        hasher
+Summary:        Common %{name} hashing application
+Requires:       %{name}%{?_isa}    == %{version}-%{release}
+
+%description    hasher
+Provides The kcapi-hasher binary used by other %{name} subpackages.
+
+
 %if %{with replace_coreutils}
 %package        checksum
 Summary:        Drop-in replacement for *sum utils provided by the %{name} package
-Requires:       %{name}%{?_isa}    == %{version}-%{release}
+Requires:       %{name}-hasher%{?_isa} == %{version}-%{release}
 
 Requires:       coreutils%{?_isa}  >= %{coreutils_evr}
 
@@ -220,7 +217,7 @@ coreutils) using %{name}.
 %if %{with replace_fipscheck}
 %package        fipscheck
 Summary:        Drop-in replacements for fipscheck/fipshmac provided by the %{name} package
-Requires:       %{name}%{?_isa}   == %{version}-%{release}
+Requires:       %{name}-hasher%{?_isa} == %{version}-%{release}
 
 Obsoletes:      fipscheck         <= %{fipscheck_evr}
 
@@ -236,7 +233,7 @@ package fipscheck) using %{name}.
 %if %{with replace_hmaccalc}
 %package        hmaccalc
 Summary:        Drop-in replacements for hmaccalc provided by the %{name} package
-Requires:       %{name}%{?_isa}   == %{version}-%{release}
+Requires:       %{name}-hasher%{?_isa} == %{version}-%{release}
 
 Obsoletes:      hmaccalc          <= %{hmaccalc_evr}
 
@@ -261,7 +258,8 @@ is highly discouraged.
 
 %package        tools
 Summary:        Utility applications for the %{name} package
-Requires:       %{name}%{?_isa} == %{version}-%{release}
+Requires:       %{name}%{?_isa}        == %{version}-%{release}
+Requires:       %{name}-hasher%{?_isa} == %{version}-%{release}
 
 %description    tools
 Utility applications that are provided with %{name}.  This includes
@@ -292,6 +290,10 @@ Auxiliary scripts for testing %{name}.
 %prep
 %autosetup -p 1 -S git
 
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=2258240
+sed -i -e 's|XML V45|XML V4.1.2|' -e 's|/xml/4\.5/|/xml/4.1.2/|' \
+    lib/doc/libkcapi.tmpl
+
 %if %{with_sysctl_tweak}
 %{__cat} << EOF > README.%{distroname_ext}
 This package increases the default limit of the ancillary buffer size
@@ -331,7 +333,7 @@ EOF
 
 %build
 %configure               \
-  --libdir=/%{_lib}      \
+  --libdir=%{_libdir}    \
   --disable-silent-rules \
   --enable-kcapi-encapp  \
   --enable-kcapi-dgstapp \
@@ -342,7 +344,7 @@ EOF
   --enable-shared        \
   --enable-static        \
   --enable-sum-prefix=   \
-  --enable-sum-dir=/%{_lib} \
+  --enable-sum-dir=%{_libdir} \
   --with-pkgconfigdir=%{_libdir}/pkgconfig
 %if %{with doc}
 %make_build all doc
@@ -375,18 +377,22 @@ EOF
 %endif
 
 # Install replacement tools, if enabled.
-%if !%{with replace_coreutils}
-%{__rm} -f                            \
-  %{buildroot}%{_bindir}/md5sum       \
-  %{buildroot}%{_bindir}/sha*sum
+%if %{with replace_coreutils}
+for app in %apps_coreutils; do
+  %{__ln_s} ../libexec/libkcapi/$app %{buildroot}%{_bindir}/$app
+done
 %endif
 
-%if !%{with replace_fipscheck}
-%{__rm} -f %{buildroot}%{_bindir}/fips*
+%if %{with replace_fipscheck}
+for app in %apps_fipscheck; do
+  %{__ln_s} ../libexec/libkcapi/$app %{buildroot}%{_bindir}/$app
+done
 %endif
 
-%if !%{with replace_hmaccalc}
-%{__rm} -f %{buildroot}%{_bindir}/sha*hmac
+%if %{with replace_hmaccalc}
+for app in %apps_hmaccalc; do
+  %{__ln_s} ../libexec/libkcapi/$app %{buildroot}%{_bindir}/$app
+done
 %endif
 
 # We don't ship autocrap dumplings.
@@ -418,7 +424,11 @@ done
 %make_build scan
 %endif
 %if %{with cppcheck}
-%make_build cppcheck
+# -UCHECK_DIR: string literal concatenation raises syntaxError
+# with cppcheck-2.11 (https://trac.cppcheck.net/ticket/11830)
+# --check-level=exhaustive: otherwise it emits warnings that get
+# treated like errors
+%make_build cppcheck CPPCHECK="cppcheck --check-level=exhaustive -UCHECK_DIR"
 %endif
 
 %if %{with test}
@@ -448,10 +458,10 @@ popd
 %doc %dir %{_pkgdocdir}
 %doc %{_pkgdocdir}/README.md
 %license COPYING*
-/%{_lib}/%{name}.so.%{vmajor}
-/%{_lib}/%{name}.so.%{version}
-/%{_lib}/fipscheck/%{name}.so.%{vmajor}.hmac
-/%{_lib}/fipscheck/%{name}.so.%{version}.hmac
+%{_libdir}/%{name}.so.%{vmajor}
+%{_libdir}/%{name}.so.%{version}
+%{_libdir}/hmaccalc/%{name}.so.%{vmajor}.hmac
+%{_libdir}/hmaccalc/%{name}.so.%{version}.hmac
 %if %{with_sysctl_tweak}
 %doc %{_pkgdocdir}/README.%{distroname_ext}
 %{_sysctldir}/%{sysctl_prio}-%{name}-optmem_max.conf
@@ -463,7 +473,7 @@ popd
 %doc %{_pkgdocdir}/TODO
 %{_includedir}/kcapi.h
 %{_mandir}/man3/kcapi_*.3.*
-/%{_lib}/%{name}.so
+%{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 
@@ -475,261 +485,62 @@ popd
 %endif
 
 
+%files          hasher
+%{_bindir}/kcapi-hasher
+%{_libexecdir}/%{name}/md5sum
+%{_libexecdir}/%{name}/sha*sum
+%{_libexecdir}/%{name}/sm*sum
+%{_libexecdir}/%{name}/fips*
+%{_libexecdir}/%{name}/sha*hmac
+%{_libexecdir}/%{name}/sm*hmac
+%{_libdir}/hmaccalc/kcapi-hasher.hmac
+%{_mandir}/man1/kcapi-hasher.1.*
+
+
 %if %{with replace_coreutils}
 %files          checksum
 %{_bindir}/md5sum
 %{_bindir}/sha*sum
-/%{_lib}/fipscheck/md5sum.hmac
-/%{_lib}/fipscheck/sha*sum.hmac
+%{_bindir}/sm*sum
 %endif
 
 %if %{with replace_fipscheck}
 %files          fipscheck
 %{_bindir}/fips*
-/%{_lib}/fipscheck/fips*.hmac
 %endif
 
 %if %{with replace_hmaccalc}
 %files          hmaccalc
 %{_bindir}/sha*hmac
-/%{_lib}/hmaccalc/sha*hmac.hmac
+%{_bindir}/sm*hmac
 %endif
 
 
 %files          static
-/%{_lib}/%{name}.a
+%{_libdir}/%{name}.a
 
 
 %files          tools
-%{_bindir}/kcapi*
-%{_mandir}/man1/kcapi*.1.*
+%{_bindir}/kcapi
+%{_bindir}/kcapi-convenience
+%{_bindir}/kcapi-dgst
+%{_bindir}/kcapi-enc
+%{_bindir}/kcapi-enc-test-large
+%{_bindir}/kcapi-rng
+%{_bindir}/kcapi-speed
+%{_mandir}/man1/kcapi-dgst.1.*
+%{_mandir}/man1/kcapi-enc.1.*
+%{_mandir}/man1/kcapi-rng.1.*
 
 
 %if %{with test_package}
 %files          tests
-%{_libexecdir}/%{name}/*
+%{_libexecdir}/%{name}/kcapi
+%{_libexecdir}/%{name}/kcapi-convenience
+%{_libexecdir}/%{name}/kcapi-enc-test-large
+%{_libexecdir}/%{name}/*.sh
 %endif
 
 
 %changelog
-* Mon Mar 15 2021 Sahana Prasad <sahana@redhat.com> - 1.2.1-1
-- Update to upstream version 1.2.1
-- Remove patch fix MSG_MORE uasge as it is added upstream
-- Remove cppcheck dependency for rhel bz#1931518
-- Add a patch to fix fuzz tests
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Aug 14 2020 Ondrej Mosnáček <omosnace@redhat.com> - 1.2.0-3
-- Require perl-interpreter instead of full perl
-- Backport fix for 5.9 kernels
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon May 25 2020 Sahana Prasad <omosnace@redhat.com> - 1.2.0-1
-- Update to upstream version 1.2.0 tracked by BZ 1839592.
-- Enable kcapi-enc tests as libkcapi BZ 1826022 is fixed.
-- Remove 110-fipshmac-compat.patch as the changes are merged upstream.
-- Remove 100-workaround-cppcheck-bug.patch as the changes are merged upstream.
-
-* Tue May 05 2020 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.5-5
-- Fix the CI test failures
-- Enable building on old kernels
-- Avoid conflicts between different versions of packages
-
-* Thu Apr 23 2020 Tomáš Mráz <tmraz@redhat.com> - 1.1.5-4
-- Add . prefix to files created by fipshmac if -d option is not specified
-
-* Wed Apr 22 2020 Sahana Prasad <sahana@redhat.com> - 1.1.5-3
-- Disables kcapi-enc tests until the kernel bug bz 1826022 is fixed.
-- Produce also the fipscheck replacement package
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Aug 13 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.5-1
-- Update to upstream version 1.1.5
-
-* Sat Jul 27 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-6
-- Backport patch to fix test failure on aarch64
-- Remove no longer needed ppc64 workaround
-
-* Sat Jul 27 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-5
-- Backport patch to fix tests
-
-* Thu Jul 25 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-4
-- Work around cppcheck issue
-- Enable gating
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon May 27 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-2
-- Fix FTBFS: hardlink is now in bindir
-
-* Sat Feb 02 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.4-1
-- Update to upstream version 1.1.4
-
-* Fri Feb 01 2019 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.3-3
-- Fix build with new GCC
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Aug 23 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.3-1
-- Update to upstream version 1.1.3
-
-* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-16
-- Add missing dependencies to the tests package
-- Update patch from upstream
-
-* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-15
-- Build and tests require perl
-
-* Thu Aug 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-14
-- Add missing script to the 'tests' package
-
-* Wed Aug 08 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-13
-- Add missing requires to the 'tests' subpackage
-
-* Tue Aug 07 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-12
-- Produce a subpackage with test scripts
-- Build the 'tests' subpackage conditionally
-
-* Wed Aug 01 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-11
-- Add patch to fix unwanted closing of FD 0
-
-* Tue Jul 31 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-10
-- Remove the kernel headers workaround
-
-* Fri Jul 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.1-9
-- Rebuild for new binutils
-
-* Fri Jul 27 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-8
-- Add more Coverity fixes from upstream
-- Add patch to fix AEAD fuzz test for BE arches
-- Fixup specfile
-
-* Mon Jul 23 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-7
-- Add various fixes from upstream
-- Drop the Requires on kernel package
-
-* Mon Jul 16 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-6
-- Put .hmac files into a separate directory
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 12 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-4
-- Add patch to work around FTBFS on rawhide
-
-* Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-3
-- Fix off-by-one error in checkfile parsing
-
-* Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-2
-- Fix command-line parsing in libkcapi-hmaccalc
-
-* Mon Jun 18 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-1
-- Update to upstream version 1.1.1
-
-* Wed May 09 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.0-5
-- Skip CLang static analysis in RHEL
-- Revert "Skip CLang static analysis in RHEL"
-- Use own sha512hmac and fipscheck
-
-* Wed May 02 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.0-4
-- Fix description lines being too long
-
-* Fri Apr 27 2018 Björn Esser <besser82@fedoraproject.org> - 1.1.0-3
-- Fix conditional for hmaccalc replacement
-
-* Mon Apr 16 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.0-2
-- Enable hmaccalc replacements in Fedora 28+
-
-* Thu Apr 12 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.0-1
-- Update to upstream version 1.1.0
-
-* Sat Mar 31 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-10
-- Replace single patches with a monolitic one from upstream
-- Obsolete replacements subpackage
-- Ignore failing tests on %%{power64} temporarily
-
-* Thu Mar 08 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.0.3-9
-- Split up the replacements subpackage
-
-* Mon Feb 26 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-8
-- Increase optmem_max preset to 81920
-
-* Mon Feb 26 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-7
-- Obsoletes work by package name, not by provides (rhbz#1537225)
-
-* Sun Feb 25 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-6
-- Add patch to fix a copy-paste typo
-
-* Sat Feb 17 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-5
-- Add patch to fix build with -Werror
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org>
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Feb 04 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-3
-- Switch to %%ldconfig_scriptlets
-
-* Wed Jan 17 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-2
-- Decrease optmem_max preset to 40960
-- Let the build fail, if the minimum kernel version cannot be met
-- Conditionalize the sysctl.d tweak on version of the kernel
-- Conditionalize the name of README.distro on the distro
-
-* Tue Jan 16 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-1
-- Initial import (rhbz#1533929)
-
-* Tue Jan 16 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.13
-- Increase optmem_max preset to 81920
-
-* Tue Jan 16 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.12
-- Add sysctl.d preset and README.fedora
-
-* Mon Jan 15 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.11
-- Make the contents of the -replacements package configurable
-
-* Mon Jan 15 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.10
-- Fix Obsoletes of the -replacements package
-
-* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.9
-- Disable the -replacements package until we have a plan for it
-
-* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.8
-- Move the kcapi-hasher binary to -replacements package, since it is
-  not of much use without the linked invocation names and saves the
-  extra Requires on the -tools package
-
-* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.7
-- Fix internal Requires of sub-packages
-- Hardlink files in %%{_bindir}
-
-* Sun Jan 14 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.6
-- Add patches from upstream
-
-* Sat Jan 13 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.5
-- Add patches from upstream
-
-* Sat Jan 13 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.4
-- Asume the testsuite cannot be run, if the value of optmem_max cannot
-  be obtained
-
-* Sat Jan 13 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.3
-- Move libraries to /%%{_lib} instead of %%{_libdir}, which is useful
-  during boot when the library might be needed before a potentially
-  seperate /usr partition is mounted
-
-* Sat Jan 13 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.2
-- Asume optmem_max is at least 20480, if the real value cannot be obtained
-
-* Fri Jan 12 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.3-0.1
-- New upstream release
-
-* Wed Jan 10 2018 Björn Esser <besser82@fedoraproject.org> - 1.0.2-0.1
-- Initial rpm release (rhbz#1533929)
+%autochangelog

plans/ci.fmf

@@ -0,0 +1,5 @@
+summary: Run CI tests
+discover:
+    how: fmf
+execute:
+    how: tmt

sources

@@ -1,2 +1,2 @@
-SHA512 (libkcapi-1.2.1.tar.xz) = bfe5e4fa4368973cfcadbde3b2a278e31bc5c36a6afba9fc92fdd5903e4e8050d09000a195c764c981753896ef543635add98bbb930dbe52a56d2f6318bc1241
-SHA512 (libkcapi-1.2.1.tar.xz.asc) = f2823add4528e16c45ccb59e2124da29007b0285faed5194fe5969f4928411faa63b3b6586bd103085b666a4dfb977cfdf0d20db6588d426ab92e29e360a37e7
+SHA512 (libkcapi-1.5.0.tar.xz) = db156ee94fc63815a31876ab072aca72a806b26961c43f2caf8495c53b95484de71cd3be84dc9e5c9560e9ee704979be059ff6c102b4893d6bbdf9a8a69a667a
+SHA512 (libkcapi-1.5.0.tar.xz.asc) = 69cfb6bf98f89c503e7fda07a54eddb9fcc2dafe418f1bc1216c051565c214a6caab83495c19b650a5c6e46e22080f8df4dd2152ab364993ed5badd256495159

tests/fipscheck-smoke-test/Makefile

@@ -1,71 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/libgcrypt/smoke-test
-#   Description: Test calls upstream test suite.
-#   Author: Ondrej Moris <omoris@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/libgcrypt/smoke-test
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Ondrej Moris <omoris@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test calls upstream test suite." >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        15m" >> $(METADATA)
-	@echo "RunFor:          libgcrypt" >> $(METADATA)
-	@echo "Requires:        libgcrypt" >> $(METADATA)
-	@echo "Requires:        nfs-utils" >> $(METADATA)
-	@echo "Requires:        rpm-build" >> $(METADATA)
-	@echo "Requires:        gawk" >> $(METADATA)
-	@echo "Requires:        gcc-c++ fipscheck" >> $(METADATA)
-	@echo "Requires:        libgpg-error-devel wget" >> $(METADATA)
-	@echo "Requires:        pkgconfig texinfo libselinux-utils" >> $(METADATA)
-	@echo "Releases:        -RHEL3 -RHEL4" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "Architectures:   i386 x86_64 s390x ia64" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/fipscheck-smoke-test/PURPOSE

@@ -1,3 +0,0 @@
-PURPOSE of /CoreOS/libgcrypt/Sanity/smoke-test
-Description: Test calls upstream test suite.
-Author: Ondrej Moris <omoris@redhat.com>

tests/fipscheck-smoke-test/runtest.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/libgcrypt/smoke-test
-#   Description: Test calls upstream test suite.
-#   Author: Ondrej Moris <omoris@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-#. /usr/bin/rhts-environment.sh
-. /usr/share/beakerlib/beakerlib.sh
-
-PACKAGE="libgcrypt"
-
-rlJournalStart
-
-    rlPhaseStartSetup
-        TmpDir=`mktemp -d`
-        rlAssertRpm $PACKAGE
-        rlFileBackup --clean "/etc/gcrypt/fips_enabled"
-        rlRun "pushd $TmpDir" 0
-        rlFetchSrcForInstalled $PACKAGE
-        rlRun "rpm -ihv `ls *.rpm`" 0
-        if grep '1' /proc/sys/crypto/fips_enabled; then
-            rlRun "echo '1' > /etc/gcrypt/fips_enabled" 0
-        fi
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        TOPDIR=`rpm --eval %_topdir`
-        rlRun "pushd $TOPDIR" 0
-        rlRun "rm -rf BUILD/libgcrypt-*" 0-255
-        rlRun "rpmbuild -vv -bc SPECS/libgcrypt.spec" 0
-        rlRun "pushd BUILD/libgcrypt-*" 0
-        rlRun "fipshmac src/.libs/libgcrypt.so.??" 0
-        rlRun "make check > $TmpDir/make_check.out" 0
-        rlRun "popd" 0
-        rlRun "popd" 0
-        rlRun "grep \"All [0-9]\+ tests passed\" $TmpDir/make_check.out" 0 \
-            "All tests passed"
-        rlRun "cat $TmpDir/make_check.out" 0
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd" 0
-        rlRun "rm -r $TmpDir" 0
-        rlFileRestore
-    rlPhaseEnd
-
-rlJournalPrintText
-rlJournalEnd

tests/main.fmf

@@ -0,0 +1,29 @@
+component: libkcapi
+contact: Ondrej Mosnacek <omosnacek@gmail.com>
+
+/upstream:
+    require: [libkcapi-tests]
+    tier: 1
+
+    /basic:
+        summary: Basic functionality
+        test: /usr/libexec/libkcapi/test.sh
+    /encrypt:
+        summary: Encryption/decryption
+        test: /usr/libexec/libkcapi/kcapi-enc-test.sh
+    /encrypt-large:
+        summary: Encryption/decryption of large data
+        test: /usr/libexec/libkcapi/kcapi-enc-test-large.sh
+    /digest:
+        summary: Message digest
+        test: /usr/libexec/libkcapi/kcapi-dgst-test.sh
+    /digest-convenience:
+        summary: Message digest convenience functions
+        test: /usr/libexec/libkcapi/kcapi-convenience.sh
+    /hasher:
+        summary: Checksum helpers
+        test: /usr/libexec/libkcapi/hasher-test.sh
+    /fuzz-test:
+        summary: Fuzz test
+        test: /usr/libexec/libkcapi/kcapi-fuzz-test.sh
+        duration: 2h

tests/tests.yml

@@ -1,45 +0,0 @@
-- hosts: localhost
-  tags:
-  - classic
-  - container
-  roles:
-  - role: standard-test-basic
-    required_packages:
-    - libkcapi-tests
-    tests:
-    - upstream-basic-test:
-        run: /usr/libexec/libkcapi/test.sh
-    - upstream-enc-test:
-        run: /usr/libexec/libkcapi/kcapi-enc-test.sh
-    - upstream-enc-test-large:
-        run: /usr/libexec/libkcapi/kcapi-enc-test-large.sh
-    - upstream-dgst-test:
-        run: /usr/libexec/libkcapi/kcapi-dgst-test.sh
-    - upstream-hasher-test:
-        run: /usr/libexec/libkcapi/hasher-test.sh
-    - upstream-convenience-test:
-        run: /usr/libexec/libkcapi/kcapi-convenience.sh
-    - upstream-fuzz-test:
-        run: /usr/libexec/libkcapi/kcapi-fuzz-test.sh
-
-- hosts: localhost
-  tags:
-  - classic
-  - container
-  roles:
-  - role: standard-test-beakerlib
-    required_packages:
-    - fipscheck
-    - gawk
-    - gcc-c++
-    - libgcrypt
-    - libgpg-error-devel
-    - libselinux-utils
-    - libtool
-    - nfs-utils
-    - pkgconfig
-    - rpm-build
-    - texinfo
-    - wget
-    tests:
-    - fipscheck-smoke-test