From 9793975ed89d6ca38bdee19ac228bb65d87c9f09 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Thu, 23 Nov 2017 14:42:39 +0100 Subject: libtasn1: Drop duplicate CVE patch The patch is already applied in upstream poky/pyro. Signed-off-by: Adrian Dudau --- .../gnutls/libtasn1/CVE-2017-10790.patch | 63 ---------------------- recipes-support/gnutls/libtasn1_%.bbappend | 5 -- 2 files changed, 68 deletions(-) delete mode 100644 recipes-support/gnutls/libtasn1/CVE-2017-10790.patch delete mode 100644 recipes-support/gnutls/libtasn1_%.bbappend (limited to 'recipes-support') diff --git a/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch b/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch deleted file mode 100644 index be84380..0000000 --- a/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d8d805e1f2e6799bb2dff4871a8598dc83088a39 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Thu, 22 Jun 2017 16:31:37 +0200 -Subject: [PATCH] _asn1_check_identifier: safer access to values read - -Signed-off-by: Nikos Mavrogiannopoulos - -http://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=commit;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39 -Upstream-Status: Backport - -CVE: CVE-2017-10790 - -Signed-off-by: Yue Tao -Signed-off-by: Wenzong Fan ---- - lib/parser_aux.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/lib/parser_aux.c b/lib/parser_aux.c -index 976ab38..786ea64 100644 ---- a/lib/parser_aux.c -+++ b/lib/parser_aux.c -@@ -955,7 +955,7 @@ _asn1_check_identifier (asn1_node node) - if (p2 == NULL) - { - if (p->value) -- _asn1_strcpy (_asn1_identifierMissing, p->value); -+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p->value); - else - _asn1_strcpy (_asn1_identifierMissing, "(null)"); - return ASN1_IDENTIFIER_NOT_FOUND; -@@ -968,9 +968,15 @@ _asn1_check_identifier (asn1_node node) - if (p2 && (type_field (p2->type) == ASN1_ETYPE_DEFAULT)) - { - _asn1_str_cpy (name2, sizeof (name2), node->name); -- _asn1_str_cat (name2, sizeof (name2), "."); -- _asn1_str_cat (name2, sizeof (name2), (char *) p2->value); -- _asn1_strcpy (_asn1_identifierMissing, p2->value); -+ if (p2->value) -+ { -+ _asn1_str_cat (name2, sizeof (name2), "."); -+ _asn1_str_cat (name2, sizeof (name2), (char *) p2->value); -+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value); -+ } -+ else -+ _asn1_strcpy (_asn1_identifierMissing, "(null)"); -+ - p2 = asn1_find_node (node, name2); - if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID) || - !(p2->type & CONST_ASSIGN)) -@@ -990,7 +996,8 @@ _asn1_check_identifier (asn1_node node) - _asn1_str_cpy (name2, sizeof (name2), node->name); - _asn1_str_cat (name2, sizeof (name2), "."); - _asn1_str_cat (name2, sizeof (name2), (char *) p2->value); -- _asn1_strcpy (_asn1_identifierMissing, p2->value); -+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value); -+ - p2 = asn1_find_node (node, name2); - if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID) - || !(p2->type & CONST_ASSIGN)) --- -1.7.9.5 - diff --git a/recipes-support/gnutls/libtasn1_%.bbappend b/recipes-support/gnutls/libtasn1_%.bbappend deleted file mode 100644 index 7ac7e24..0000000 --- a/recipes-support/gnutls/libtasn1_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# look for files in the layer first -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://CVE-2017-10790.patch \ - " -- cgit v1.2.3-54-g00ecf