11 changed files with 631 additions and 426 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/000-Kern-5.8-fix-MSG_MORE-usage.patch
+++ b/000-Kern-5.8-fix-MSG_MORE-usage.patch
@ -0,0 +1,163 @@
+From b612c52c5ccf021d01e6c786db1a31a697f21d97 Mon Sep 17 00:00:00 2001
+From: Stephan Mueller <smueller@chronox.de>
+Date: Thu, 13 Aug 2020 21:58:07 +0200
+Subject: [PATCH] Kern 5.8: fix MSG_MORE usage
+
+With kernel 5.8, a precise use of MSG_MORE is mandatory to support
+a stream cipher approach (init -> update -> update -> ... -> final).
+All but the last update operations must use MSG_MORE, the last update
+operation must not use MSG_MORE.
+
+Reported-by: Ondrej Mosnacek <omosnace@redhat.com>
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+---
+ lib/kcapi-aead.c      | 24 ++++++++++++++----------
+ lib/kcapi-kernel-if.c |  6 ++----
+ test/kcapi-main.c     | 31 +++++++++++++++++--------------
+ 3 files changed, 33 insertions(+), 28 deletions(-)
+
+diff --git a/lib/kcapi-aead.c b/lib/kcapi-aead.c
+index d241618..45a0bd7 100644
+--- a/lib/kcapi-aead.c
+++ b/lib/kcapi-aead.c
+@@ -210,13 +210,15 @@ _kcapi_aead_encrypt_aio_fallback(struct kcapi_handle *handle,
+ 				 uint32_t iovlen, const uint8_t *iv)
+ {
+ 	uint32_t i;
+-	int32_t ret = kcapi_aead_stream_init_enc(handle, iv, NULL, 0);
+-
+-	if (ret < 0)
+-		return ret;
+	int32_t ret = 0;
+ 
+ 	for (i = 0; i < iovlen; i++) {
+-		int rc = kcapi_aead_stream_update_last(handle, iniov, 1);
+		int rc = kcapi_aead_stream_init_enc(handle, iv, NULL, 0);
+
+		if (rc < 0)
+			return rc;
+
+		rc = kcapi_aead_stream_update_last(handle, iniov, 1);
+ 		if (rc < 0)
+ 			return rc;
+ 
+@@ -271,13 +273,15 @@ _kcapi_aead_decrypt_aio_fallback(struct kcapi_handle *handle,
+ 				 uint32_t iovlen, const uint8_t *iv)
+ {
+ 	uint32_t i;
+-	int32_t ret = kcapi_aead_stream_init_dec(handle, iv, NULL, 0);
+-
+-	if (ret < 0)
+-		return ret;
+	int32_t ret = 0;
+ 
+ 	for (i = 0; i < iovlen; i++) {
+-		int rc = kcapi_aead_stream_update_last(handle, iniov, 1);
+		int rc = kcapi_aead_stream_init_dec(handle, iv, NULL, 0);
+
+		if (rc < 0)
+			return rc;
+
+		rc = kcapi_aead_stream_update_last(handle, iniov, 1);
+ 		if (rc < 0)
+ 			return rc;
+ 
+diff --git a/lib/kcapi-kernel-if.c b/lib/kcapi-kernel-if.c
+index bea994f..42cf1ad 100644
+--- a/lib/kcapi-kernel-if.c
+++ b/lib/kcapi-kernel-if.c
+@@ -439,8 +439,7 @@ int _kcapi_aio_send_iov(struct kcapi_handle *handle, struct iovec *iov,
+ 		if (0 > ret)
+ 			return ret;
+ 	} else {
+-		ret = _kcapi_common_send_meta(handle, NULL, 0, enc,
+-					      len ? MSG_MORE : 0);
+		ret = _kcapi_common_send_meta(handle, NULL, 0, enc, MSG_MORE);
+ 		if (0 > ret)
+ 			return ret;
+ 		ret = _kcapi_common_vmsplice_iov(handle, iov, iovlen, 0);
+@@ -1246,8 +1245,7 @@ int32_t _kcapi_cipher_crypt(struct kcapi_handle *handle, const uint8_t *in,
+ 		if (0 > ret)
+ 			return ret;
+ 	} else {
+-		ret = _kcapi_common_send_meta(handle, NULL, 0, enc,
+-					      inlen ? MSG_MORE : 0);
+		ret = _kcapi_common_send_meta(handle, NULL, 0, enc, MSG_MORE);
+ 		if (0 > ret)
+ 			return ret;
+ 		ret = _kcapi_common_vmsplice_chunk(handle, in, inlen, 0);
+diff --git a/test/kcapi-main.c b/test/kcapi-main.c
+index 51f6ec7..64e466c 100644
+--- a/test/kcapi-main.c
+++ b/test/kcapi-main.c
+@@ -846,7 +846,7 @@ static int cavs_sym(struct kcapi_cavs *cavs_test, uint32_t loops,
+ 		goto out;
+ 	}
+ 
+-	for(i = 0; i < loops; i++) {
+	for (i = 0; i < loops; i++) {
+ 		_get_time(&begin);
+ 		if (cavs_test->enc) {
+ 			ret = kcapi_cipher_encrypt(handle,
+@@ -886,7 +886,7 @@ static int cavs_sym(struct kcapi_cavs *cavs_test, uint32_t loops,
+ }
+ 
+ static void mt_sym_writer(struct kcapi_handle *handle, struct iovec *iov,
+-			  int forking)
+			  int forking, int last)
+ {
+ 	int ret;
+ 
+@@ -899,7 +899,10 @@ static void mt_sym_writer(struct kcapi_handle *handle, struct iovec *iov,
+ 			return;
+ 	}
+ 
+-	ret = kcapi_cipher_stream_update_last(handle, iov, 1);
+	if (last)
+		ret = kcapi_cipher_stream_update_last(handle, iov, 1);
+	else
+		ret = kcapi_cipher_stream_update(handle, iov, 1);
+ 	if (0 > ret)
+ 		printf("Sending of data failed\n");
+ 
+@@ -1004,7 +1007,7 @@ static int cavs_sym_stream(struct kcapi_cavs *cavs_test, uint32_t loops,
+ 			iov.iov_len = cavs_test->ctlen;
+ 		}
+ 
+-		mt_sym_writer(handle_ptr, &iov, forking);
+		mt_sym_writer(handle_ptr, &iov, forking, i == (loops * 2 - 1));
+ 
+ 		outiov.iov_base = outbuf_ptr;
+ 		outiov.iov_len = outbuflen;
+@@ -1636,21 +1639,21 @@ static int cavs_aead_stream(struct kcapi_cavs *cavs_test, uint32_t loops,
+ 	if (ret)
+ 		goto out;
+ 
+-	if (cavs_test->enc)
+-		ret = kcapi_aead_stream_init_enc(handle, newiv, NULL, 0);
+-
+-	else
+-		ret = kcapi_aead_stream_init_dec(handle, newiv, NULL, 0);
+-	if (0 > ret) {
+-		printf("Initialization of cipher buffer failed\n");
+-		goto out;
+-	}
+-
+ 	for (i = 0; i < loops; i++) {
+ 		int errsv = 0;
+ 
+ 		memset(outbuf, 0, outbuflen);
+ 
+		if (cavs_test->enc)
+			ret = kcapi_aead_stream_init_enc(handle, newiv, NULL, 0);
+		else
+			ret = kcapi_aead_stream_init_dec(handle, newiv, NULL, 0);
+		if (0 > ret) {
+			printf("Initialization of cipher buffer failed\n");
+			goto out;
+		}
+
+
+ 		iov.iov_base = cavs_test->assoc;
+ 		iov.iov_len = cavs_test->assoclen;
+ 		if (cavs_test->enc) {
--- a/247
+++ b/247
@ -1,247 +0,0 @@
-* 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)
--- a/libkcapi.spec
+++ b/libkcapi.spec
@ -1,6 +1,6 @@
 # Shared object version of libkcapi.
 %global vmajor            1
-%global vminor            5
+%global vminor            2
 %global vpatch            0

 # Do we build the replacements packages?
@ -22,21 +22,6 @@
 %else
 %bcond_with test_package
 %endif
-# disable cppcheck analysis in ELN/RHEL to avoid the dependency bz#1931518
-%if 0%{?rhel}
-%bcond_with cppcheck
-%else
-%bcond_without cppcheck
-%endif
-
-# Use `--without test` to build without running the tests
-%bcond_without test
-# Use `--without fuzz_test` to skip the fuzz test during build
-%bcond_without fuzz_test
-# Use `--without doc` to build without the -doc subpackage
-%bcond_without doc
-# Use `--without clang_sa` to skip clang static analysis during build
-%bcond_without clang_sa

 # This package needs at least Linux Kernel v4.10.0.
 %global min_kernel_ver    4.10.0
@ -84,69 +69,72 @@
 %global hmaccalc_evr      0.9.14-10%{?dist}
 %endif

-%global apps_coreutils sha1sum sha224sum sha256sum sha384sum sha512sum md5sum sm3sum
-%global apps_hmaccalc sha1hmac sha224hmac sha256hmac sha384hmac sha512hmac sm3hmac
-%global apps_fipscheck fipscheck fipshmac
+%global apps_hmaccalc sha1hmac sha224hmac sha256hmac sha384hmac sha512hmac
+%global apps_fipscheck sha1sum sha224sum sha256sum sha384sum sha512sum md5sum fipscheck fipshmac

 # On old kernels use mock hashers implemented via openssl
 %if %{lua:print(rpm.vercmp(posix.uname('%r'), '3.19'));} >= 0
 %global sha512hmac bin/kcapi-hasher -n sha512hmac
 %global fipshmac   bin/kcapi-hasher -n fipshmac
 %else
-%global sha512hmac bash %{SOURCE2}
-%global fipshmac   bash %{SOURCE3}
+%global sha512hmac bash %{_sourcedir}/sha512hmac-openssl.sh
+%global fipshmac   bash %{_sourcedir}/fipshmac-openssl.sh
 %endif

-# Add generation of HMAC checksum of the final stripped
-# binary.  %%define with lazy globbing is used here
+# Add generation of HMAC checksums of the final stripped
+# binaries.  %%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}%{_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 \
+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                   \
 %{__ln_s} libkcapi.so.%{version}.hmac                            \\\
-  "$lib_path"/hmaccalc/libkcapi.so.%{vmajor}.hmac                \
+  "$lib_path"/fipscheck/libkcapi.so.%{vmajor}.hmac               \
 %{nil}

+
 Name:           libkcapi
 Version:        %{vmajor}.%{vminor}.%{vpatch}
-Release:        %autorelease
+Release:        3%{?dist}
 Summary:        User space interface to the Linux Kernel Crypto API

-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
+License:        BSD or GPLv2
+URL:            http://www.chronox.de/%{name}.html
+Source0:        http://www.chronox.de/%{name}/%{name}-%{version}.tar.xz
+Source1:        http://www.chronox.de/%{name}/%{name}-%{version}.tar.xz.asc
 Source2:        sha512hmac-openssl.sh
 Source3:        fipshmac-openssl.sh

+Patch0:         %{giturl}/commit/b612c52c5ccf.patch#/000-Kern-5.8-fix-MSG_MORE-usage.patch
+
 BuildRequires:  bash
+BuildRequires:  clang
 BuildRequires:  coreutils
+BuildRequires:  cppcheck
+BuildRequires:  docbook-utils-pdf
 BuildRequires:  gcc
-BuildRequires:  git-core
+BuildRequires:  git
 BuildRequires:  hardlink
 BuildRequires:  kernel-headers >= %{min_kernel_ver}
 BuildRequires:  libtool
-BuildRequires:  make
 BuildRequires:  openssl
 BuildRequires:  perl-interpreter
 BuildRequires:  systemd
 BuildRequires:  xmlto
-%if %{with doc}
-BuildRequires:  docbook-utils-pdf
-%endif
-%if %{with clang_sa}
-BuildRequires:  clang
-%endif
-%if %{with cppcheck}
-BuildRequires:  cppcheck >= 2.4
-%endif

 # For ownership of %%{_sysctldir}.
 Requires:       systemd
@ -176,7 +164,6 @@ Requires:       %{name}%{?_isa} == %{version}-%{release}
 Header files for applications that use %{name}.


-%if %{with doc}
 %package        doc
 Summary:        User documentation for the %{name} package
 BuildArch:      noarch
@ -187,21 +174,12 @@ Requires:       %{name} == %{version}-%{release}

 %description    doc
 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}-hasher%{?_isa} == %{version}-%{release}
+Requires:       %{name}%{?_isa}    == %{version}-%{release}

 Requires:       coreutils%{?_isa}  >= %{coreutils_evr}

@ -217,7 +195,7 @@ coreutils) using %{name}.
 %if %{with replace_fipscheck}
 %package        fipscheck
 Summary:        Drop-in replacements for fipscheck/fipshmac provided by the %{name} package
-Requires:       %{name}-hasher%{?_isa} == %{version}-%{release}
+Requires:       %{name}%{?_isa}   == %{version}-%{release}

 Obsoletes:      fipscheck         <= %{fipscheck_evr}

@ -233,7 +211,7 @@ package fipscheck) using %{name}.
 %if %{with replace_hmaccalc}
 %package        hmaccalc
 Summary:        Drop-in replacements for hmaccalc provided by the %{name} package
-Requires:       %{name}-hasher%{?_isa} == %{version}-%{release}
+Requires:       %{name}%{?_isa}   == %{version}-%{release}

 Obsoletes:      hmaccalc          <= %{hmaccalc_evr}

@ -258,8 +236,7 @@ is highly discouraged.

 %package        tools
 Summary:        Utility applications for the %{name} package
-Requires:       %{name}%{?_isa}        == %{version}-%{release}
-Requires:       %{name}-hasher%{?_isa} == %{version}-%{release}
+Requires:       %{name}%{?_isa} == %{version}-%{release}

 %description    tools
 Utility applications that are provided with %{name}.  This includes
@ -290,10 +267,6 @@ 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
@ -333,7 +306,7 @@ EOF

 %build
 %configure               \
-  --libdir=%{_libdir}    \
+  --libdir=/%{_lib}      \
  --disable-silent-rules \
  --enable-kcapi-encapp  \
  --enable-kcapi-dgstapp \
@ -344,13 +317,9 @@ EOF
  --enable-shared        \
  --enable-static        \
  --enable-sum-prefix=   \
-  --enable-sum-dir=%{_libdir} \
+  --enable-sum-dir=/%{_lib} \
  --with-pkgconfigdir=%{_libdir}/pkgconfig
-%if %{with doc}
 %make_build all doc
-%else
-%make_build all man
-%endif


 %install
@ -367,32 +336,22 @@ EOF
 %if %{with_sysctl_tweak}
  README.%{distroname_ext}                          \
 %endif
-%if %{with doc}
-  doc/%{name}.p{df,s}                               \
-%endif
-  README.md CHANGES.md TODO
-
-%if %{with doc}
+  README.md CHANGES.md TODO doc/%{name}.p{df,s}
 %{__cp} -pr lib/doc/html %{buildroot}%{_pkgdocdir}
-%endif

 # Install replacement tools, if enabled.
-%if %{with replace_coreutils}
-for app in %apps_coreutils; do
-  %{__ln_s} ../libexec/libkcapi/$app %{buildroot}%{_bindir}/$app
-done
+%if !%{with replace_coreutils}
+%{__rm} -f                            \
+  %{buildroot}%{_bindir}/md5sum       \
+  %{buildroot}%{_bindir}/sha*sum
 %endif

-%if %{with replace_fipscheck}
-for app in %apps_fipscheck; do
-  %{__ln_s} ../libexec/libkcapi/$app %{buildroot}%{_bindir}/$app
-done
+%if !%{with replace_fipscheck}
+%{__rm} -f %{buildroot}%{_bindir}/fips*
 %endif

-%if %{with replace_hmaccalc}
-for app in %apps_hmaccalc; do
-  %{__ln_s} ../libexec/libkcapi/$app %{buildroot}%{_bindir}/$app
-done
+%if !%{with replace_hmaccalc}
+%{__rm} -f %{buildroot}%{_bindir}/sha*hmac
 %endif

 # We don't ship autocrap dumplings.
@ -404,13 +363,11 @@ done
 # Remove 0-size files.
 %{_bindir}/find %{buildroot} -type f -size 0 -print -delete

-%if %{with doc}
 # Make sure all docs have non-exec permissions, except for the dirs.
 %{_bindir}/find %{buildroot}%{_pkgdocdir} -type f -print | \
  %{_bindir}/xargs %{__chmod} -c 0644
 %{_bindir}/find %{buildroot}%{_pkgdocdir} -type d -print | \
  %{_bindir}/xargs %{__chmod} -c 0755
-%endif

 # Possibly save some space by hardlinking.
 for d in %{_mandir} %{_pkgdocdir}; do
@ -420,18 +377,10 @@ done

 %check
 # Some basic sanity checks.
-%if %{with clang_sa}
-%make_build scan
-%endif
-%if %{with 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
+for t in cppcheck scan; do
+  %make_build $t
+done

-%if %{with test}
 # On some arches `/proc/sys/net/core/optmem_max` is lower than 20480,
 # which is the lowest limit needed to run the testsuite.  If that limit
 # is not met, we do not run it.
@ -440,15 +389,12 @@ done
 %if %{lua:print(rpm.vercmp(posix.uname('%r'), '5.1'));} >= 0
 # Real testsuite.
 pushd test
-%if %{with fuzz_test}
 ENABLE_FUZZ_TEST=1 \
-%endif
 NO_32BIT_TEST=1    \
  ./test-invocation.sh
 popd
 %endif
 %endif
-%endif


 %ldconfig_scriptlets
@ -458,10 +404,10 @@ popd
 %doc %dir %{_pkgdocdir}
 %doc %{_pkgdocdir}/README.md
 %license COPYING*
-%{_libdir}/%{name}.so.%{vmajor}
-%{_libdir}/%{name}.so.%{version}
-%{_libdir}/hmaccalc/%{name}.so.%{vmajor}.hmac
-%{_libdir}/hmaccalc/%{name}.so.%{version}.hmac
+/%{_lib}/%{name}.so.%{vmajor}
+/%{_lib}/%{name}.so.%{version}
+/%{_lib}/fipscheck/%{name}.so.%{vmajor}.hmac
+/%{_lib}/fipscheck/%{name}.so.%{version}.hmac
 %if %{with_sysctl_tweak}
 %doc %{_pkgdocdir}/README.%{distroname_ext}
 %{_sysctldir}/%{sysctl_prio}-%{name}-optmem_max.conf
@ -473,74 +419,262 @@ popd
 %doc %{_pkgdocdir}/TODO
 %{_includedir}/kcapi.h
 %{_mandir}/man3/kcapi_*.3.*
-%{_libdir}/%{name}.so
+/%{_lib}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc


-%if %{with doc}
 %files          doc
 %doc %{_pkgdocdir}/html
 %doc %{_pkgdocdir}/%{name}.pdf
 %doc %{_pkgdocdir}/%{name}.ps
-%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
-%{_bindir}/sm*sum
+/%{_lib}/fipscheck/md5sum.hmac
+/%{_lib}/fipscheck/sha*sum.hmac
 %endif

 %if %{with replace_fipscheck}
 %files          fipscheck
 %{_bindir}/fips*
+/%{_lib}/fipscheck/fips*.hmac
 %endif

 %if %{with replace_hmaccalc}
 %files          hmaccalc
 %{_bindir}/sha*hmac
-%{_bindir}/sm*hmac
+/%{_lib}/hmaccalc/sha*hmac.hmac
 %endif


 %files          static
-%{_libdir}/%{name}.a
+/%{_lib}/%{name}.a


 %files          tools
-%{_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.*
+%{_bindir}/kcapi*
+%{_mandir}/man1/kcapi*.1.*


 %if %{with test_package}
 %files          tests
-%{_libexecdir}/%{name}/kcapi
-%{_libexecdir}/%{name}/kcapi-convenience
-%{_libexecdir}/%{name}/kcapi-enc-test-large
-%{_libexecdir}/%{name}/*.sh
+%{_libexecdir}/%{name}/*
 %endif


 %changelog
-%autochangelog
+* 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)
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@ -1,5 +0,0 @@
-summary: Run CI tests
-discover:
-    how: fmf
-execute:
-    how: tmt
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (libkcapi-1.5.0.tar.xz) = db156ee94fc63815a31876ab072aca72a806b26961c43f2caf8495c53b95484de71cd3be84dc9e5c9560e9ee704979be059ff6c102b4893d6bbdf9a8a69a667a
-SHA512 (libkcapi-1.5.0.tar.xz.asc) = 69cfb6bf98f89c503e7fda07a54eddb9fcc2dafe418f1bc1216c051565c214a6caab83495c19b650a5c6e46e22080f8df4dd2152ab364993ed5badd256495159
+SHA512 (libkcapi-1.2.0.tar.xz) = f097aac4fb06d0e0a7f62376506caa2d4cdb03572be89286ff335684f9a10285ffea4b3cfb37fd49e51435aa6636256aa12f0cf970fd48b1358aace8ac14b289
+SHA512 (libkcapi-1.2.0.tar.xz.asc) = 336769b04c75ee23d4cae98697a6ea14e5bd244bcefaa2396d80dab95538620c9353100685bd0568f61b8dfa3089c6ff7e4fdcdde949012ba0d7fe6aac650577
--- a/tests/fipscheck-smoke-test/Makefile
+++ b/tests/fipscheck-smoke-test/Makefile
@ -0,0 +1,71 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   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)
--- a/tests/fipscheck-smoke-test/PURPOSE
+++ b/tests/fipscheck-smoke-test/PURPOSE
@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/libgcrypt/Sanity/smoke-test
+Description: Test calls upstream test suite.
+Author: Ondrej Moris <omoris@redhat.com>
--- a/tests/fipscheck-smoke-test/runtest.sh
+++ b/tests/fipscheck-smoke-test/runtest.sh
@ -0,0 +1,71 @@
+#!/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
--- a/tests/main.fmf
+++ b/tests/main.fmf
@ -1,29 +0,0 @@
-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
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,45 @@
+- 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