diff --git a/.gitignore b/.gitignore index 019360b..e72bbd6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ nettle-1.15.tar.gz /nettle-3.4.1rc1-hobbled.tar.xz /nettle-3.6-hobbled.tar.xz /nettle-3.7-hobbled.tar.xz +/nettle-3.7.1-hobbled.tar.xz diff --git a/nettle-3.7-chacha-counter-ppc64.patch b/nettle-3.7-chacha-counter-ppc64.patch deleted file mode 100644 index 7f9f103..0000000 --- a/nettle-3.7-chacha-counter-ppc64.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 64837b2e433e2b99b893683949bad3a99acab38f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niels=20M=C3=B6ller?= -Date: Wed, 10 Feb 2021 11:22:23 +0100 -Subject: [PATCH] Fix chacha counter update for _4core variants. - ---- - ChangeLog | 4 ++++ - chacha-crypt.c | 10 +++++++--- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/chacha-crypt.c b/chacha-crypt.c -index 081ebcf4..1fdfc813 100644 ---- a/chacha-crypt.c -+++ b/chacha-crypt.c -@@ -80,13 +80,16 @@ _nettle_chacha_crypt_4core(struct chacha_ctx *ctx, - while (length > 2*CHACHA_BLOCK_SIZE) - { - _nettle_chacha_4core (x, ctx->state, CHACHA_ROUNDS); -- ctx->state[12] += 4; -- ctx->state[13] += (ctx->state[12] < 4); - if (length <= 4*CHACHA_BLOCK_SIZE) - { -+ uint32_t incr = 3 + (length > 3*CHACHA_BLOCK_SIZE); -+ ctx->state[12] += incr; -+ ctx->state[13] += (ctx->state[12] < incr); - memxor3 (dst, src, x, length); - return; - } -+ ctx->state[12] += 4; -+ ctx->state[13] += (ctx->state[12] < 4); - memxor3 (dst, src, x, 4*CHACHA_BLOCK_SIZE); - - length -= 4*CHACHA_BLOCK_SIZE; -@@ -200,12 +203,13 @@ _nettle_chacha_crypt32_4core(struct chacha_ctx *ctx, - while (length > 2*CHACHA_BLOCK_SIZE) - { - _nettle_chacha_4core32 (x, ctx->state, CHACHA_ROUNDS); -- ctx->state[12] += 4; - if (length <= 4*CHACHA_BLOCK_SIZE) - { -+ ctx->state[12] += 3 + (length > 3*CHACHA_BLOCK_SIZE); - memxor3 (dst, src, x, length); - return; - } -+ ctx->state[12] += 4; - memxor3 (dst, src, x, 4*CHACHA_BLOCK_SIZE); - - length -= 4*CHACHA_BLOCK_SIZE; --- -2.29.2 - diff --git a/nettle.spec b/nettle.spec index b82fd68..745081b 100644 --- a/nettle.spec +++ b/nettle.spec @@ -14,8 +14,8 @@ %bcond_without fips Name: nettle -Version: 3.7 -Release: 3%{?dist} +Version: 3.7.1 +Release: 1%{?dist} Summary: A low-level cryptographic library License: LGPLv3+ or GPLv2+ @@ -28,8 +28,6 @@ Source2: nettle-3.5-remove-ecc-testsuite.patch %endif Patch0: nettle-3.6-remove-ecc-testsuite.patch Patch1: nettle-3.4-annocheck.patch -# https://lists.lysator.liu.se/pipermail/nettle-bugs/2021/009423.html -Patch2: nettle-3.7-chacha-counter-ppc64.patch BuildRequires: make BuildRequires: gcc @@ -173,6 +171,9 @@ make check %changelog +* Tue Mar 9 2021 Daiki Ueno - 3.7.1-1 +- Update to nettle 3.7.1 + * Wed Feb 10 2021 Daiki Ueno - 3.7-3 - Port a fix for chacha counter issue on ppc64le diff --git a/sources b/sources index 6e014ee..3e9755d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nettle-3.7-hobbled.tar.xz) = 267ad57aa4fc7791490c94aae5c533489e6bc8080a8275eb7e8c037437b7e981769d7ff771115cd66c57bf4088589780653fd293ff612c233dd00fea0ea94248 +SHA512 (nettle-3.7.1-hobbled.tar.xz) = 52c77bf8c6c91363d70f4ac9265400846f56bb62251f6708bb80f64c957cfcd3467640fad666b86e79d7183104e1f3d011c61cd6490ca710c8959011d48a04dd