summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-01-23 16:05:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-26 13:09:10 +0000
commit7d3b1408d9ba556fccb5158562496143d5af4a3d (patch)
tree6478cfa18f7c79077c46d88cfb345d78b9881ea5 /meta
parente1f8f9c7eb9d1cf24120920cb7d8b301928bda18 (diff)
downloadpoky-7d3b1408d9ba556fccb5158562496143d5af4a3d.tar.gz
libtasn1: upgrade to version 4.13
Remove backported patch: CVE-2017-10790.patch (From OE-Core rev: 2e42ce251a5a789cd2b0e9abc94de07fd0603072) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch63
-rw-r--r--meta/recipes-support/gnutls/libtasn1_4.13.bb (renamed from meta/recipes-support/gnutls/libtasn1_4.12.bb)5
2 files changed, 2 insertions, 66 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch b/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch
deleted file mode 100644
index be843808a2..0000000000
--- a/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From d8d805e1f2e6799bb2dff4871a8598dc83088a39 Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Thu, 22 Jun 2017 16:31:37 +0200
4Subject: [PATCH] _asn1_check_identifier: safer access to values read
5
6Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
7
8http://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=commit;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39
9Upstream-Status: Backport
10
11CVE: CVE-2017-10790
12
13Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
14Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
15---
16 lib/parser_aux.c | 17 ++++++++++++-----
17 1 file changed, 12 insertions(+), 5 deletions(-)
18
19diff --git a/lib/parser_aux.c b/lib/parser_aux.c
20index 976ab38..786ea64 100644
21--- a/lib/parser_aux.c
22+++ b/lib/parser_aux.c
23@@ -955,7 +955,7 @@ _asn1_check_identifier (asn1_node node)
24 if (p2 == NULL)
25 {
26 if (p->value)
27- _asn1_strcpy (_asn1_identifierMissing, p->value);
28+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p->value);
29 else
30 _asn1_strcpy (_asn1_identifierMissing, "(null)");
31 return ASN1_IDENTIFIER_NOT_FOUND;
32@@ -968,9 +968,15 @@ _asn1_check_identifier (asn1_node node)
33 if (p2 && (type_field (p2->type) == ASN1_ETYPE_DEFAULT))
34 {
35 _asn1_str_cpy (name2, sizeof (name2), node->name);
36- _asn1_str_cat (name2, sizeof (name2), ".");
37- _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
38- _asn1_strcpy (_asn1_identifierMissing, p2->value);
39+ if (p2->value)
40+ {
41+ _asn1_str_cat (name2, sizeof (name2), ".");
42+ _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
43+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value);
44+ }
45+ else
46+ _asn1_strcpy (_asn1_identifierMissing, "(null)");
47+
48 p2 = asn1_find_node (node, name2);
49 if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID) ||
50 !(p2->type & CONST_ASSIGN))
51@@ -990,7 +996,8 @@ _asn1_check_identifier (asn1_node node)
52 _asn1_str_cpy (name2, sizeof (name2), node->name);
53 _asn1_str_cat (name2, sizeof (name2), ".");
54 _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
55- _asn1_strcpy (_asn1_identifierMissing, p2->value);
56+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value);
57+
58 p2 = asn1_find_node (node, name2);
59 if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID)
60 || !(p2->type & CONST_ASSIGN))
61--
621.7.9.5
63
diff --git a/meta/recipes-support/gnutls/libtasn1_4.12.bb b/meta/recipes-support/gnutls/libtasn1_4.13.bb
index 7a7571ad3b..2d223861c7 100644
--- a/meta/recipes-support/gnutls/libtasn1_4.12.bb
+++ b/meta/recipes-support/gnutls/libtasn1_4.13.bb
@@ -11,13 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
11SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
12 file://dont-depend-on-help2man.patch \ 12 file://dont-depend-on-help2man.patch \
13 file://0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch \ 13 file://0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch \
14 file://CVE-2017-10790.patch \
15 " 14 "
16 15
17DEPENDS = "bison-native" 16DEPENDS = "bison-native"
18 17
19SRC_URI[md5sum] = "5c724bd1f73aaf4a311833e1cd297b21" 18SRC_URI[md5sum] = "ce2ba4d3088119b48e7531a703669c52"
20SRC_URI[sha256sum] = "6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753" 19SRC_URI[sha256sum] = "7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca"
21 20
22inherit autotools texinfo binconfig lib_package gtk-doc 21inherit autotools texinfo binconfig lib_package gtk-doc
23 22