summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-07-19 14:27:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-19 15:13:47 +0100
commit3ca9f90dffad3907ceec605a851ae949dd3b6bd6 (patch)
treecd2f0c663dcaf3195d4c72d34bc6d089dce13136
parentccc964cf9fde0d71d289c22c2a231f0021461012 (diff)
downloadpoky-3ca9f90dffad3907ceec605a851ae949dd3b6bd6.tar.gz
libgcrypt: fix CVE-2017-9526
In libgcrypt before 1.7.7, an attacker who learns the EdDSA session key (from side-channel observation during the signing process) can easily recover the long-term secret key. 1.7.7 makes a cipher/ecc-eddsa.c change to store this session key in secure memory, to ensure that constant-time point operations are used in the MPI library. (From OE-Core rev: fb28c54347fcf4957b9b8ee7dee423d859eb7820) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch39
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt.inc1
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch b/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch
new file mode 100644
index 0000000000..f6c4ca76f3
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch
@@ -0,0 +1,39 @@
1CVE: CVE-2017-9526
2Upstream-Status: Backport
3Signed-off-by: Ross Burton <ross.burton@intel.com>
4
5From b3cab278eb9c2ceda79f980bc26460d97f260041 Mon Sep 17 00:00:00 2001
6From: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be>
7Date: Thu, 19 Jan 2017 17:00:15 +0100
8Subject: [PATCH] ecc: Store EdDSA session key in secure memory.
9
10* cipher/ecc-eddsa.c (_gcry_ecc_eddsa_sign): use mpi_snew to allocate
11session key.
12--
13
14An attacker who learns the EdDSA session key from side-channel
15observation during the signing process, can easily revover the long-
16term secret key. Storing the session key in secure memory ensures that
17constant time point operations are used in the MPI library.
18
19Signed-off-by: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be>
20---
21 cipher/ecc-eddsa.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/cipher/ecc-eddsa.c b/cipher/ecc-eddsa.c
25index f91f8489..813e030d 100644
26--- a/cipher/ecc-eddsa.c
27+++ b/cipher/ecc-eddsa.c
28@@ -603,7 +603,7 @@ _gcry_ecc_eddsa_sign (gcry_mpi_t input, ECC_secret_key *skey,
29 a = mpi_snew (0);
30 x = mpi_new (0);
31 y = mpi_new (0);
32- r = mpi_new (0);
33+ r = mpi_snew (0);
34 ctx = _gcry_mpi_ec_p_internal_new (skey->E.model, skey->E.dialect, 0,
35 skey->E.p, skey->E.a, skey->E.b);
36 b = (ctx->nbits+7)/8;
37--
382.11.0
39
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index 404f870db0..8e7a38f894 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -18,6 +18,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
18 file://add-pkgconfig-support.patch \ 18 file://add-pkgconfig-support.patch \
19 file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ 19 file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
20 file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \ 20 file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \
21 file://0001-ecc-Store-EdDSA-session-key-in-secure-memory.patch \
21 file://CVE-2017-7526.patch \ 22 file://CVE-2017-7526.patch \
22" 23"
23 24