summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-05-20 14:24:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:14:41 +0100
commitfd0d4d7f5c1d142b2c3880e4be13bc383ec53b45 (patch)
treed9873cf5e97e6fdadf256a4ba6bb7b23783c3114 /meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch
parente10352e61468bed57320aa9f144c78f249463533 (diff)
downloadpoky-fd0d4d7f5c1d142b2c3880e4be13bc383ec53b45.tar.gz
gnupg: Update to 2.0.20
Removed obsolete patch (From OE-Core rev: 2e89010cb4a19d525bc43589d487827dd4bc401d) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch')
-rw-r--r--meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch b/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch
deleted file mode 100644
index 64c30342cc..0000000000
--- a/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1commit 498882296ffac7987c644aaf2a0aa108a2925471
2Author: Werner Koch <wk@gnupg.org>
3Date: Thu Dec 20 09:43:41 2012 +0100
4
5 gpg: Import only packets which are allowed in a keyblock.
6
7 * g10/import.c (valid_keyblock_packet): New.
8 (read_block): Store only valid packets.
9 --
10
11 A corrupted key, which for example included a mangled public key
12 encrypted packet, used to corrupt the keyring. This change skips all
13 packets which are not allowed in a keyblock.
14
15 GnuPG-bug-id: 1455
16
17 (cherry-picked from commit 3a4b96e665fa639772854058737ee3d54ba0694e)
18
19Upstream-Status: Backport
20
21Signed-off-by: Saul Wold <sgw@linux.intel.com>
22
23diff --git a/g10/import.c b/g10/import.c
24index ba2439d..ad112d6 100644
25--- a/g10/import.c
26+++ b/g10/import.c
27@@ -347,6 +347,27 @@ import_print_stats (void *hd)
28 }
29
30
31+/* Return true if PKTTYPE is valid in a keyblock. */
32+static int
33+valid_keyblock_packet (int pkttype)
34+{
35+ switch (pkttype)
36+ {
37+ case PKT_PUBLIC_KEY:
38+ case PKT_PUBLIC_SUBKEY:
39+ case PKT_SECRET_KEY:
40+ case PKT_SECRET_SUBKEY:
41+ case PKT_SIGNATURE:
42+ case PKT_USER_ID:
43+ case PKT_ATTRIBUTE:
44+ case PKT_RING_TRUST:
45+ return 1;
46+ default:
47+ return 0;
48+ }
49+}
50+
51+
52 /****************
53 * Read the next keyblock from stream A.
54 * PENDING_PKT should be initialzed to NULL
55@@ -424,7 +445,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root )
56 }
57 in_cert = 1;
58 default:
59- if( in_cert ) {
60+ if (in_cert && valid_keyblock_packet (pkt->pkttype)) {
61 if( !root )
62 root = new_kbnode( pkt );
63 else