| 1 |
commit: e066e778a6f4dc94090d03d703c29459de25d78f |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 19 08:56:14 2019 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 19 08:56:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e066e778 |
| 7 |
|
| 8 |
dev-libs/nettle: fix C89 issue |
| 9 |
|
| 10 |
Thanks: Daniel M. Weeks |
| 11 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=683812 |
| 12 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 14 |
|
| 15 |
dev-libs/nettle/files/nettle-3.4.1-build.patch | 53 ++++++++++++++++++++++++++ |
| 16 |
dev-libs/nettle/nettle-3.4.1.ebuild | 4 ++ |
| 17 |
2 files changed, 57 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-libs/nettle/files/nettle-3.4.1-build.patch b/dev-libs/nettle/files/nettle-3.4.1-build.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..4351dfeb5bc |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-libs/nettle/files/nettle-3.4.1-build.patch |
| 24 |
@@ -0,0 +1,53 @@ |
| 25 |
+From f5a3a224bf00bef5669366d2ae23c2b2b13b8016 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@×××××××××××.se> |
| 27 |
+Date: Wed, 26 Dec 2018 11:04:31 +0100 |
| 28 |
+Subject: [PATCH] Fix accidental use of C99 for loop. |
| 29 |
+ |
| 30 |
+* rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop. |
| 31 |
+Reported by Andreas Gustafsson. |
| 32 |
+* testsuite/rsa-sec-decrypt-test.c (test_main): Likewise. |
| 33 |
+--- |
| 34 |
+ ChangeLog | 6 ++++++ |
| 35 |
+ rsa-sign-tr.c | 3 ++- |
| 36 |
+ testsuite/rsa-sec-decrypt-test.c | 3 ++- |
| 37 |
+ 3 files changed, 10 insertions(+), 2 deletions(-) |
| 38 |
+ |
| 39 |
+diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c |
| 40 |
+index 59c9bd07..f824c4ca 100644 |
| 41 |
+--- a/rsa-sign-tr.c |
| 42 |
++++ b/rsa-sign-tr.c |
| 43 |
+@@ -239,8 +239,9 @@ static int |
| 44 |
+ sec_equal(const mp_limb_t *a, const mp_limb_t *b, size_t limbs) |
| 45 |
+ { |
| 46 |
+ volatile mp_limb_t z = 0; |
| 47 |
++ size_t i; |
| 48 |
+ |
| 49 |
+- for (size_t i = 0; i < limbs; i++) |
| 50 |
++ for (i = 0; i < limbs; i++) |
| 51 |
+ { |
| 52 |
+ z |= (a[i] ^ b[i]); |
| 53 |
+ } |
| 54 |
+diff --git a/testsuite/rsa-sec-decrypt-test.c b/testsuite/rsa-sec-decrypt-test.c |
| 55 |
+index 64f0b13c..fb0ed3a1 100644 |
| 56 |
+--- a/testsuite/rsa-sec-decrypt-test.c |
| 57 |
++++ b/testsuite/rsa-sec-decrypt-test.c |
| 58 |
+@@ -68,6 +68,7 @@ test_main(void) |
| 59 |
+ unsigned n_size = 1024; |
| 60 |
+ mpz_t gibberish; |
| 61 |
+ mpz_t garbage; |
| 62 |
++ size_t size; |
| 63 |
+ |
| 64 |
+ rsa_private_key_init(&key); |
| 65 |
+ rsa_public_key_init(&pub); |
| 66 |
+@@ -78,7 +79,7 @@ test_main(void) |
| 67 |
+ |
| 68 |
+ memset(verifybad, 'A', PAYLOAD_SIZE); |
| 69 |
+ |
| 70 |
+- for (size_t size = 1; size < 51; size++) |
| 71 |
++ for (size = 1; size < 51; size++) |
| 72 |
+ { |
| 73 |
+ ASSERT (rsa_generate_keypair(&pub, &key, &random_ctx, |
| 74 |
+ (nettle_random_func *) knuth_lfib_random, |
| 75 |
+-- |
| 76 |
+2.18.1 |
| 77 |
+ |
| 78 |
|
| 79 |
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild |
| 80 |
index 6541764cd8b..2fff9c6d49a 100644 |
| 81 |
--- a/dev-libs/nettle/nettle-3.4.1.ebuild |
| 82 |
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild |
| 83 |
@@ -25,6 +25,10 @@ MULTILIB_WRAPPED_HEADERS=( |
| 84 |
DOCS=() |
| 85 |
HTML_DOCS=() |
| 86 |
|
| 87 |
+PATCHES=( |
| 88 |
+ "${FILESDIR}/${P}-build.patch" |
| 89 |
+) |
| 90 |
+ |
| 91 |
pkg_setup() { |
| 92 |
use doc && DOCS+=( |
| 93 |
nettle.pdf |
Archives