summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-support/gnupg
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-10-09 20:59:25 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-10-15 15:44:24 +0300
commit6ef3265d2b0f8bc55c5d3fffa253e961ab31b041 (patch)
tree554e9b914035d95e21c187e75c2ff4396821a49e /poky/meta/recipes-support/gnupg
parentc3966252f9945108d27845e12b7732a825a9ca4e (diff)
downloadopenbmc-6ef3265d2b0f8bc55c5d3fffa253e961ab31b041.tar.xz
poky: sumo refresh 3b8dc3a88e..36d5cee56b
Update poky to sumo HEAD. Andreas Müller (1): libsdl2: Fix left rotated display for RaspPi/VC4/GLES2 Anuj Mittal (2): qemux86-directdisk: remove mem= parameter initramfs-framework/udev: call settle before kill Armin Kuster (1): libcroco: CVE-2017-7961 Awais Belal (1): bitbake: toaster: Fix bitbake flexible path error from Bugzilla #12891 Chong Yi Chai (1): mkefidisk: fix installation of kernel image Paulo Neves (1): bitbake: fetcher: Fixed remote removal not throwing exception. Richard Purdie (1): bitbake: main: Fix environment handling for UI module imports Ross Burton (2): security_flags: disable static PIE in glibc cmake: put cmake.m4 and toolchain file in PN Sinan Kaya (1): gnupg: CVE-2018-9234 Change-Id: Ia9ff256122334cf5f1fb8d377ac3f295605ac68b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-support/gnupg')
-rw-r--r--poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch28
-rw-r--r--poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch b/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch
new file mode 100644
index 0000000000..d4ba1d8635
--- /dev/null
+++ b/poky/meta/recipes-support/gnupg/gnupg/CVE-2018-9234.patch
@@ -0,0 +1,28 @@
+From ce055269c80f6e7c1393c0deec7bc5f0d37895ea Mon Sep 17 00:00:00 2001
+From: Sinan Kaya <okaya@kernel.org>
+Date: Sun, 23 Sep 2018 04:05:47 +0000
+Subject: [PATCH] g10: Fix filtering by PK->REQ_USAGE
+
+Upstream-Status: Backport [https://dev.gnupg.org/rGa17d2d1f690ebe5d005b4589a5fe378b6487c657]
+CVE: CVE-2018-9234
+Signed-off-by: Sinan Kaya <okaya@kernel.org>
+---
+ g10/getkey.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/g10/getkey.c b/g10/getkey.c
+index e31e023..ca2500c 100644
+--- a/g10/getkey.c
++++ b/g10/getkey.c
+@@ -1810,6 +1810,8 @@ get_pubkey_byfprint (ctrl_t ctrl, PKT_public_key *pk, kbnode_t *r_keyblock,
+ ctx.items[0].mode = fprint_len == 16 ? KEYDB_SEARCH_MODE_FPR16
+ : KEYDB_SEARCH_MODE_FPR20;
+ memcpy (ctx.items[0].u.fpr, fprint, fprint_len);
++ if (pk)
++ ctx.req_usage = pk->req_usage;
+ rc = lookup (ctrl, &ctx, 0, &kb, &found_key);
+ if (!rc && pk)
+ pk_from_block (pk, kb, found_key);
+--
+2.19.0
+
diff --git a/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb b/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb
index d6bfaff377..d777fcb122 100644
--- a/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb
+++ b/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb
@@ -15,6 +15,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0003-dirmngr-uses-libgpg-error.patch \
file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
file://CVE-2018-12020.patch \
+ file://CVE-2018-9234.patch \
"
SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch"