diff options
Diffstat (limited to 'meta/recipes-support/nettle/nettle-3.5.1/CVE-2021-20305-4.patch')
-rw-r--r-- | meta/recipes-support/nettle/nettle-3.5.1/CVE-2021-20305-4.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-support/nettle/nettle-3.5.1/CVE-2021-20305-4.patch b/meta/recipes-support/nettle/nettle-3.5.1/CVE-2021-20305-4.patch new file mode 100644 index 0000000000..54b4fa584c --- /dev/null +++ b/meta/recipes-support/nettle/nettle-3.5.1/CVE-2021-20305-4.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | Backport of: | ||
2 | |||
3 | From 51f643eee00e2caa65c8a2f5857f49acdf3ef1ce Mon Sep 17 00:00:00 2001 | ||
4 | From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> | ||
5 | Date: Sat, 13 Mar 2021 16:27:50 +0100 | ||
6 | Subject: [PATCH] Ensure ecdsa_sign output is canonically reduced. | ||
7 | |||
8 | * ecc-ecdsa-sign.c (ecc_ecdsa_sign): Ensure s output is reduced to | ||
9 | canonical range. | ||
10 | |||
11 | (cherry picked from commit c24b36160dc5303f7541dd9da1429c4046f27398) | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | https://sources.debian.org/data/main/n/nettle/3.4.1-1%2Bdeb10u1/debian/patches/CVE-2021-20305-4.patch | ||
15 | CVE: CVE-2021-20305 dep4 | ||
16 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
17 | |||
18 | --- | ||
19 | ChangeLog | 3 +++ | ||
20 | ecc-ecdsa-sign.c | 3 +-- | ||
21 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
22 | |||
23 | #diff --git a/ChangeLog b/ChangeLog | ||
24 | #index 63848f53..fb2d7f66 100644 | ||
25 | #--- a/ChangeLog | ||
26 | #+++ b/ChangeLog | ||
27 | #@@ -1,5 +1,8 @@ | ||
28 | # 2021-03-13 Niels Möller <nisse@lysator.liu.se> | ||
29 | # | ||
30 | #+ * ecc-ecdsa-sign.c (ecc_ecdsa_sign): Ensure s output is reduced to | ||
31 | #+ canonical range. | ||
32 | #+ | ||
33 | # * ecc-ecdsa-verify.c (ecc_ecdsa_verify): Use ecc_mod_mul_canonical | ||
34 | # to compute the scalars used for ecc multiplication. | ||
35 | # * testsuite/ecdsa-verify-test.c (test_main): Add test case that | ||
36 | --- a/ecc-ecdsa-sign.c | ||
37 | +++ b/ecc-ecdsa-sign.c | ||
38 | @@ -90,9 +90,8 @@ ecc_ecdsa_sign (const struct ecc_curve * | ||
39 | |||
40 | ecc_modq_mul (ecc, tp, zp, rp); | ||
41 | ecc_modq_add (ecc, hp, hp, tp); | ||
42 | - ecc_modq_mul (ecc, tp, hp, kinv); | ||
43 | + ecc_mod_mul_canonical (&ecc->q, sp, hp, kinv, tp); | ||
44 | |||
45 | - mpn_copyi (sp, tp, ecc->p.size); | ||
46 | #undef P | ||
47 | #undef hp | ||
48 | #undef kinv | ||