diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch')
-rw-r--r-- | yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch b/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch deleted file mode 100644 index a956f426b..000000000 --- a/yocto-poky/meta/recipes-support/nettle/nettle-2.7.1/CVE-2015-8803_8805.patch +++ /dev/null @@ -1,71 +0,0 @@ -Upstream-Status: Backport -https://git.lysator.liu.se/nettle/nettle/commit/c71d2c9d20eeebb985e3872e4550137209e3ce4d - -CVE: CVE-2015-8803 -CVE: CVE-2015-8805 - -Same fix for both. - -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: nettle-2.7.1/ecc-256.c -=================================================================== ---- nettle-2.7.1.orig/ecc-256.c -+++ nettle-2.7.1/ecc-256.c -@@ -96,9 +96,19 @@ ecc_256_modp (const struct ecc_curve *ec - q2 += t + (q1 < t); - - assert (q2 < 2); -+ /* -+ n-1 n-2 n-3 n-4 -+ +---+---+---+---+ -+ | u1| u0| u low | -+ +---+---+---+---+ -+ - | q1(2^96-1)| -+ +-------+---+ -+ |q2(2^.)| -+ +-------+ - -- /* We multiply by two low limbs of p, 2^96 - 1, so we could use -- shifts rather than mul. */ -+ We multiply by two low limbs of p, 2^96 - 1, so we could use -+ shifts rather than mul. -+ */ - t = mpn_submul_1 (rp + n - 4, ecc->p, 2, q1); - t += cnd_sub_n (q2, rp + n - 3, ecc->p, 1); - t += (-q2) & 0xffffffff; -@@ -108,7 +118,10 @@ ecc_256_modp (const struct ecc_curve *ec - u0 -= t; - t = (u1 < cy); - u1 -= cy; -- u1 += cnd_add_n (t, rp + n - 4, ecc->p, 3); -+ -+ cy = cnd_add_n (t, rp + n - 4, ecc->p, 2); -+ u0 += cy; -+ u1 += (u0 < cy); - u1 -= (-t) & 0xffffffff; - } - rp[2] = u0; -@@ -195,7 +208,7 @@ ecc_256_modq (const struct ecc_curve *ec - - /* Conditional add of p */ - u1 += t; -- u2 += (t<<32) + (u0 < t); -+ u2 += (t<<32) + (u1 < t); - - t = cnd_add_n (t, rp + n - 4, ecc->q, 2); - u1 += t; -Index: nettle-2.7.1/ChangeLog -=================================================================== ---- nettle-2.7.1.orig/ChangeLog -+++ nettle-2.7.1/ChangeLog -@@ -1,3 +1,9 @@ -+2015-12-10 Niels Möller <nisse@lysator.liu.se> -+ -+ * ecc-256.c (ecc_256_modp): Fixed carry propagation bug. Problem -+ reported by Hanno Böck. -+ (ecc_256_modq): Fixed another carry propagation bug. -+ - 2013-05-28 Niels Möller <nisse@lysator.liu.se> - - * Released nettle-2.7.1. |