From 16adbe8079a7177b1e4aac067be57e65179f7224 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 7 Jun 2021 10:07:53 +0200 Subject: [PATCH] Update to nettle 3.7.3 --- .gitignore | 1 + nettle-3.7.2-suppress-maybe-uninit.patch | 40 ------------------------ nettle.spec | 6 ++-- sources | 2 +- 4 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 nettle-3.7.2-suppress-maybe-uninit.patch diff --git a/.gitignore b/.gitignore index 1ea3d7b..88a87ab 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ nettle-1.15.tar.gz /nettle-3.7-hobbled.tar.xz /nettle-3.7.1-hobbled.tar.xz /nettle-3.7.2-hobbled.tar.xz +/nettle-3.7.3-hobbled.tar.xz diff --git a/nettle-3.7.2-suppress-maybe-uninit.patch b/nettle-3.7.2-suppress-maybe-uninit.patch deleted file mode 100644 index f7295ea..0000000 --- a/nettle-3.7.2-suppress-maybe-uninit.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 952c2d890902782ee90b6ed273f1d8b4e95dbff1 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Sun, 21 Mar 2021 11:13:36 +0100 -Subject: [PATCH] nettle-benchmark: suppress -Wmaybe-uninitialized warnings - ---- - examples/nettle-benchmark.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c -index ca6346e0..518b947d 100644 ---- a/examples/nettle-benchmark.c -+++ b/examples/nettle-benchmark.c -@@ -392,6 +392,7 @@ time_umac(void) - - uint8_t key[16]; - -+ init_key(sizeof(key), key); - umac32_set_key (&ctx32, key); - info.ctx = &ctx32; - info.update = (nettle_hash_update_func *) umac32_update; -@@ -434,6 +435,7 @@ time_cmac(void) - - uint8_t key[16]; - -+ init_key(sizeof(key), key); - cmac_aes128_set_key (&ctx, key); - info.ctx = &ctx; - info.update = (nettle_hash_update_func *) cmac_aes128_update; -@@ -451,6 +453,7 @@ time_poly1305_aes(void) - struct poly1305_aes_ctx ctx; - uint8_t key[32]; - -+ init_key(sizeof(key), key); - poly1305_aes_set_key (&ctx, key); - info.ctx = &ctx; - info.update = (nettle_hash_update_func *) poly1305_aes_update; --- -2.30.2 - diff --git a/nettle.spec b/nettle.spec index 3c9bfc7..ea68207 100644 --- a/nettle.spec +++ b/nettle.spec @@ -14,7 +14,7 @@ %bcond_without fips Name: nettle -Version: 3.7.2 +Version: 3.7.3 Release: 1%{?dist} Summary: A low-level cryptographic library @@ -27,7 +27,6 @@ Source1: %{name}-%{version_old}-hobbled.tar.xz Source2: nettle-3.5-remove-ecc-testsuite.patch %endif Patch0: nettle-3.4-annocheck.patch -Patch1: nettle-3.7.2-suppress-maybe-uninit.patch BuildRequires: make BuildRequires: gcc @@ -171,6 +170,9 @@ make check %changelog +* Mon Jun 7 2021 Daiki Ueno - 3.7.3-1 +- Update to nettle 3.7.3 + * Sun Mar 21 2021 Daiki Ueno - 3.7.2-1 - Update to nettle 3.7.2 - Merge nettle-3.6-remove-ecc-testsuite.patch to hobble-nettle script diff --git a/sources b/sources index be33000..3cd06cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nettle-3.7.2-hobbled.tar.xz) = ac81d2954905d354c742c8708905cd94114bccbd00051c2b5a27c8abf8e0b2d5f9978a8dff8dc5f73d8eacfebe19c5a9a37ccb7257b8fe6f858da27aedfd72ab +SHA512 (nettle-3.7.3-hobbled.tar.xz) = c4de959abe62f96e5a02b43886e32315fe7b986fa78e81d0f6ce61e728d5e4e85fad237058b248943817e2d2f13c071989503ad78493ba26720a403675404338