Update to upstream version 1.2.0 tracked by BZ 1839592

Signed-off-by: Sahana Prasad <sahana@redhat.com>
This commit is contained in:
Sahana Prasad 2020-05-25 11:16:36 +02:00
parent bc1c80da03
commit d7a1af30f2
5 changed files with 12 additions and 56 deletions

View File

@ -1,13 +0,0 @@
diff --git a/test/kcapi-main.c b/test/kcapi-main.c
index 2ae0edb..6818e67 100644
--- a/test/kcapi-main.c
+++ b/test/kcapi-main.c
@@ -237,7 +237,7 @@ static inline uint64_t _time_delta(struct timespec *start, struct timespec *end)
static int get_random(uint8_t *buf, uint32_t buflen, unsigned int flags)
{
- int ret;
+ int ret = 0;
if (buflen > INT_MAX)
return 1;

View File

@ -1,30 +0,0 @@
diff -up libkcapi-1.1.5/apps/kcapi-hasher.c.fipshmac-compat libkcapi-1.1.5/apps/kcapi-hasher.c
--- libkcapi-1.1.5/apps/kcapi-hasher.c.fipshmac-compat 2019-01-23 07:14:51.000000000 +0100
+++ libkcapi-1.1.5/apps/kcapi-hasher.c 2020-04-23 14:37:59.518173594 +0200
@@ -386,10 +386,16 @@ static char *paste(char *dst, const char
static char *get_hmac_file(const char *filename, const char *checkdir)
{
size_t i, filelen, pathlen, namelen, basenamestart = 0;
- size_t prefixlen = strlen(CHECK_PREFIX);
+ const char *check_prefix = CHECK_PREFIX;
+ size_t prefixlen = strlen(check_prefix);
size_t suffixlen = strlen(CHECK_SUFFIX);
char *cursor, *checkfile = NULL;
+ if (prefixlen == 0 && checkdir == NULL) {
+ check_prefix = ".";
+ prefixlen = 1;
+ }
+
filelen = strlen(filename);
if (filelen > 4096) {
fprintf(stderr, "File too long\n");
@@ -415,7 +421,7 @@ static char *get_hmac_file(const char *f
} else if (pathlen > 0)
cursor = paste(cursor, filename, pathlen);
- cursor = paste(cursor, CHECK_PREFIX, prefixlen);
+ cursor = paste(cursor, check_prefix, prefixlen);
cursor = paste(cursor, filename + basenamestart, namelen);
cursor = paste(cursor, "."CHECK_SUFFIX, 1 + suffixlen);
strncpy(cursor, "\0", 1);

View File

@ -1,7 +1,7 @@
# Shared object version of libkcapi.
%global vmajor 1
%global vminor 1
%global vpatch 5
%global vminor 2
%global vpatch 0
# Do we build the replacements packages?
%bcond_with replace_coreutils
@ -109,7 +109,7 @@ done \
Name: libkcapi
Version: %{vmajor}.%{vminor}.%{vpatch}
Release: 5%{?dist}
Release: 1%{?dist}
Summary: User space interface to the Linux Kernel Crypto API
License: BSD or GPLv2
@ -119,8 +119,6 @@ Source1: http://www.chronox.de/%{name}/%{name}-%{version}.tar.xz.asc
Source2: sha512hmac-openssl.sh
Source3: fipshmac-openssl.sh
Patch100: 100-workaround-cppcheck-bug.patch
Patch110: 110-fipshmac-compat.patch
BuildRequires: bash
BuildRequires: clang
@ -136,7 +134,6 @@ BuildRequires: openssl
BuildRequires: perl
BuildRequires: systemd
BuildRequires: xmlto
BuildRequires: sed
# For ownership of %%{_sysctldir}.
Requires: systemd
@ -391,8 +388,6 @@ done
%if %{lua:print(rpm.vercmp(posix.uname('%r'), '5.1'));} >= 0
# Real testsuite.
pushd test
# Temporarily disable failing enc tests until BZ 1826022 is fixed.
sed -i '/kcapi-enc-test/,+6d' test-invocation.sh
ENABLE_FUZZ_TEST=1 \
NO_32BIT_TEST=1 \
./test-invocation.sh
@ -470,6 +465,12 @@ popd
%changelog
* 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

View File

@ -1,2 +1,2 @@
SHA512 (libkcapi-1.1.5.tar.xz) = a9cd82464310d73d79d4aa7808cfe077a7b186511a34396c0521a158198769a7b97785af6072255e2cc8dcc23f5171694811faebcf9801aeb9861d729274fbc2
SHA512 (libkcapi-1.1.5.tar.xz.asc) = 0630fa29d9f835bd0d1fcd4a58b9d89bf8b1f576d2f1ae5e385bbbff04edd9ba4cad1bdf6132e80f4d15d86e8d8488fa0cb187fbfaa559ed6aa6ad2a15bd97ef
SHA512 (libkcapi-1.2.0.tar.xz) = f097aac4fb06d0e0a7f62376506caa2d4cdb03572be89286ff335684f9a10285ffea4b3cfb37fd49e51435aa6636256aa12f0cf970fd48b1358aace8ac14b289
SHA512 (libkcapi-1.2.0.tar.xz.asc) = 336769b04c75ee23d4cae98697a6ea14e5bd244bcefaa2396d80dab95538620c9353100685bd0568f61b8dfa3089c6ff7e4fdcdde949012ba0d7fe6aac650577

View File

@ -10,9 +10,7 @@
- upstream-basic-test:
run: /usr/libexec/libkcapi/test.sh
- upstream-enc-test:
# temporarily disabled until kernel bug is fixed:
# https://lore.kernel.org/linux-crypto/CAAUqJDvZt7_j+eor1sXRg+QmrdXTjMiymFnji86PoatsYPUugA@mail.gmail.com/T/
run: /usr/libexec/libkcapi/kcapi-enc-test.sh || true
run: /usr/libexec/libkcapi/kcapi-enc-test.sh
- upstream-enc-test-large:
run: /usr/libexec/libkcapi/kcapi-enc-test-large.sh
- upstream-dgst-test: