diff --git a/001-fix-fuzz-test.patch b/001-fix-fuzz-test.patch deleted file mode 100644 index c1fdbc5..0000000 --- a/001-fix-fuzz-test.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e8c22fe01c6dd46399396694cd1d72a6988dc287 Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek -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 ---- - 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; diff --git a/libkcapi.spec b/libkcapi.spec index 7058918..66e68a2 100644 --- a/libkcapi.spec +++ b/libkcapi.spec @@ -1,7 +1,7 @@ # Shared object version of libkcapi. %global vmajor 1 -%global vminor 2 -%global vpatch 1 +%global vminor 3 +%global vpatch 0 # Do we build the replacements packages? %bcond_with replace_coreutils @@ -135,8 +135,6 @@ Source1: https://www.chronox.de/%{name}/%{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 @@ -512,6 +510,9 @@ popd %changelog +* Mon Jul 12 2021 Simo Sorce - 1.3.0-1 +- Update to upstream version 1.3.0 + * Mon Mar 15 2021 Sahana Prasad - 1.2.1-1 - Update to upstream version 1.2.1 - Remove patch fix MSG_MORE uasge as it is added upstream diff --git a/sources b/sources index 8e514ec..613d2f6 100644 --- a/sources +++ b/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.3.0.tar.xz) = 3b6fbf9b6651dec870c9181709c8e7d7882d4967fe1c4d53a59cc428fcf83e2ec1f56f09406d8918f145beb417dffbfdf4719c2c61631d8008bb049970323ed0 +SHA512 (libkcapi-1.3.0.tar.xz.asc) = 9b89ea6743e43727bc9e003bb617970f4ab389b3d740a16105ca6eeff2a3485a56664aecf957c5e30fb54f5dfa44fc0cc015dd4e9b518b16db2fad55e8cba69c