summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngutzmann <nathangutzmann@gmail.com>2016-03-09 16:17:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-11 10:56:02 (GMT)
commitbe0c978fa1a79319119b9bd147d7e0e6d2e8e764 (patch)
treee3dda66434b66c7df46cc69e7f49ffc614c9d066
parentdbb46510cc7dc5b4050af453276d8c4cb843362a (diff)
downloadpoky-be0c978fa1a79319119b9bd147d7e0e6d2e8e764.tar.gz
nettle: The variable named p in the patch file was incorrectly named.
The variable in question should have been called ecc->p. The patch has been updated so that the compilation of the nettle recipe would complete successfully. The backport originated from this commit https://git.lysator.liu.se/nettle/nettle/commit/c71d2c9d20eeebb985e3872e4550137209e3ce4d (From OE-Core rev: 7f4d3b90840a14d660a56d23e1fe79f4fb633d59) Signed-off-by: ngutzmann <nathangutzmann@gmail.com> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch b/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch
index 1c4b9a9..a956f42 100644
--- a/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch
+++ b/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch
@@ -40,7 +40,7 @@ Index: nettle-2.7.1/ecc-256.c
40 u1 -= cy; 40 u1 -= cy;
41- u1 += cnd_add_n (t, rp + n - 4, ecc->p, 3); 41- u1 += cnd_add_n (t, rp + n - 4, ecc->p, 3);
42+ 42+
43+ cy = cnd_add_n (t, rp + n - 4, p->m, 2); 43+ cy = cnd_add_n (t, rp + n - 4, ecc->p, 2);
44+ u0 += cy; 44+ u0 += cy;
45+ u1 += (u0 < cy); 45+ u1 += (u0 < cy);
46 u1 -= (-t) & 0xffffffff; 46 u1 -= (-t) & 0xffffffff;