mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 12:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

nettle: Security fix CVE-2015-8803 and CVE-2015-8805

Browse Source 
(From OE-Core rev: f62eb452244c3124cc88ef01c14116dac43f377a)

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Armin Kuster
2016-02-05 08:37:29 -08:00
committed by Richard Purdie
parent 5ffc3267e7
commit 3e8a07b901
2 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
meta/recipes-support/nettle/nettle-3.1.1/CVE-2015-8803_8805.patch Normal file
View File

@@ -0,0 +1,71 @@
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-3.1.1/ecc-256.c
===================================================================
--- nettle-3.1.1.orig/ecc-256.c
+++ nettle-3.1.1/ecc-256.c
@@ -113,8 +113,19 @@ ecc_256_modp (const struct ecc_modulo *p
assert (q2 < 2);
- /* We multiply by two low limbs of p, 2^96 - 1, so we could use
- shifts rather than mul. */
+ /*
+ 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.
+ */
t = mpn_submul_1 (rp + n - 4, p->m, 2, q1);
t += cnd_sub_n (q2, rp + n - 3, p->m, 1);
t += (-q2) & 0xffffffff;
@@ -124,7 +135,10 @@ ecc_256_modp (const struct ecc_modulo *p
u0 -= t;
t = (u1 < cy);
u1 -= cy;
- u1 += cnd_add_n (t, rp + n - 4, p->m, 3);
+
+ cy = cnd_add_n (t, rp + n - 4, p->m, 2);
+ u0 += cy;
+ u1 += (u0 < cy);
u1 -= (-t) & 0xffffffff;
}
rp[2] = u0;
@@ -211,7 +225,7 @@ ecc_256_modq (const struct ecc_modulo *q
/* Conditional add of p */
u1 += t;
- u2 += (t<<32) + (u0 < t);
+ u2 += (t<<32) + (u1 < t);
t = cnd_add_n (t, rp + n - 4, q->m, 2);
u1 += t;
Index: nettle-3.1.1/ChangeLog
===================================================================
--- nettle-3.1.1.orig/ChangeLog
+++ nettle-3.1.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.
+
2015-04-24 Niels Möller <nisse@lysator.liu.se>
* Released nettle-3.1.1.

4
meta/recipes-support/nettle/nettle_3.1.1.bb
View File

@@ -7,5 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6
file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \
file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e"
SRC_URI += "\
file://CVE-2015-8803_8805.patch \
"
SRC_URI[md5sum] = "b40fa88dc32f37a182b6b42092ebb144"
SRC_URI[sha256sum] = "5fd4d25d64d8ddcb85d0d897572af73b05b4d163c6cc49438a5bfbb8ff293d4c"