From patchwork Sun Dec 22 10:18:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sergio Prado X-Patchwork-Id: 1214636 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=e-labworks.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=e-labworks-com.20150623.gappssmtp.com header.i=@e-labworks-com.20150623.gappssmtp.com header.b="zfUJ2ahX"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47gfJB0kgDz9sPc for ; Sun, 22 Dec 2019 21:44:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1F08185E91; Sun, 22 Dec 2019 10:44:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zGTgNR4Te0Zw; Sun, 22 Dec 2019 10:44:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 23E2686142; Sun, 22 Dec 2019 10:44:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5C5211BF82B for ; Sun, 22 Dec 2019 10:44:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4757386142 for ; Sun, 22 Dec 2019 10:44:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0Y0kGHCpPBTO for ; Sun, 22 Dec 2019 10:44:52 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1B27B85E91 for ; Sun, 22 Dec 2019 10:44:52 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id i23so2275641pfo.2 for ; Sun, 22 Dec 2019 02:44:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=e-labworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ksk4BuUabar4JVbh/cOv/aA9DhCTnSui2ksKl5g+Wvs=; b=zfUJ2ahXxidPD8D/MDOgE/yRg+Sxr7VsdmfycJtKp/vhNMQo4HHdHD7mVFsoJAw5NZ Iwo3+n9VSU31n+7rv1RcAzlXjH8OdfxmIFnj6h3HGYuotdO5MYkbFqwWovopwTqkwzaK 0ERi2Inpo6ZC/2TU/GwNnH8QwFUA+ktrjYKDTE0nWzfFhmM9azUePc/l8NuWXALlNFUk fE+hFxFSxbRbN2MOjY37EBXl5cOGOJVBy0nZday9sW4RXagCdsvkS5MEsH5Mzeisi/sa Pok+MIr4x1J6I5/RnK7+y3WBqWIMu+U2Rc3cI5KyX1QkqXZX+lETrhmpc+m+MZsB9GaL rikw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ksk4BuUabar4JVbh/cOv/aA9DhCTnSui2ksKl5g+Wvs=; b=jV8Xwcr0m1EIcZaghRVfXrny3azQgurbkz6vjbSqi0F9ZX9smANEmbQ44GFPBzffth Rehxr/riDRQnf5NcjFT+aCPWgzpz4yu47qpxopqcC+91TpbDF59VKtQFbyOQcZRg1Riy wVaOBFYTedU0lTDYQLzKkhUNRJWjUjf4zOi1TYcd3Gr/ou7gEuB01V7VnAPArFnQ0TDz M5SDX14nFHHPJt3rB53S9ZoQrg84dZKlHGZBoDpFEmYVrGJAE+pVtB6b1LUoreDRarPa A0RJHMbL/D0FyniPZeKOcg6gxTHaMKVkteVH4pS4Zq8X2Wx4R8tnD+KnOpr0clllCZcc KEWA== X-Gm-Message-State: APjAAAUhsyR1Blrs4hywRq3GVlW+u9CDEtfMRUdCZPRuSx22gfcogo5D 6cKwAoysP2Z0mMjmnXG+FDmbMKpvEqM= X-Google-Smtp-Source: APXvYqyZwfYHnzlUpVru7GfhropgdK3heAYdpoBtH9H1FMn6vqQawZroVhc1rwRAm0Ebqtq9CaYDew== X-Received: by 2002:a65:4c82:: with SMTP id m2mr24711179pgt.432.1577009901640; Sun, 22 Dec 2019 02:18:21 -0800 (PST) Received: from localhost.localdomain ([179.209.45.161]) by smtp.gmail.com with ESMTPSA id d23sm19554285pfo.176.2019.12.22.02.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Dec 2019 02:18:20 -0800 (PST) From: Sergio Prado To: buildroot@buildroot.org Date: Sun, 22 Dec 2019 07:18:07 -0300 Message-Id: <20191222101807.5936-1-sergio.prado@e-labworks.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/wolfssl: bump to version 4.3.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergio Prado Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove patch already applied upstream (refactored on commit c06efb6c1fda0) Signed-off-by: Sergio Prado --- ...e-location-index-hasn-t-exceed-maxim.patch | 84 ------------------- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 2 +- 3 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 package/wolfssl/0001-Check-domain-name-location-index-hasn-t-exceed-maxim.patch diff --git a/package/wolfssl/0001-Check-domain-name-location-index-hasn-t-exceed-maxim.patch b/package/wolfssl/0001-Check-domain-name-location-index-hasn-t-exceed-maxim.patch deleted file mode 100644 index 758992e148bf..000000000000 --- a/package/wolfssl/0001-Check-domain-name-location-index-hasn-t-exceed-maxim.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 52f28bd5149360f8e3bf8ca13d3fb9a77283df7c Mon Sep 17 00:00:00 2001 -From: Sean Parkinson -Date: Wed, 6 Nov 2019 08:28:09 +1000 -Subject: [PATCH] Check domain name location index hasn't exceed maximum before - setting - -[CVE-2019–18840] -Signed-off-by: Peter Korsgaard ---- - wolfcrypt/src/asn.c | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - -diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c -index 637f4c355..d3793b7b3 100644 ---- a/wolfcrypt/src/asn.c -+++ b/wolfcrypt/src/asn.c -@@ -5117,8 +5117,10 @@ static int GetName(DecodedCert* cert, int nameType) - XMEMCPY(&full[idx], &cert->source[cert->srcIdx], strLen); - idx += strLen; - #if defined(OPENSSL_EXTRA) -- /* store order that DN was parsed */ -- dName->loc[count++] = id; -+ if (count < DOMAIN_COMPONENT_MAX) { -+ /* store order that DN was parsed */ -+ dName->loc[count++] = id; -+ } - #endif - } - -@@ -5191,8 +5193,10 @@ static int GetName(DecodedCert* cert, int nameType) - XMEMCPY(&full[idx], &cert->source[cert->srcIdx], strLen); - idx += strLen; - #if defined(OPENSSL_EXTRA) -- /* store order that DN was parsed */ -- dName->loc[count++] = id; -+ if (count < DOMAIN_COMPONENT_MAX) { -+ /* store order that DN was parsed */ -+ dName->loc[count++] = id; -+ } - #endif - } - -@@ -5276,8 +5280,10 @@ static int GetName(DecodedCert* cert, int nameType) - XMEMCPY(&full[idx], &cert->source[cert->srcIdx], adv); - idx += adv; - #if defined(OPENSSL_EXTRA) -- /* store order that DN was parsed */ -- dName->loc[count++] = ASN_EMAIL_NAME; -+ if (count < DOMAIN_COMPONENT_MAX) { -+ /* store order that DN was parsed */ -+ dName->loc[count++] = ASN_EMAIL_NAME; -+ } - #endif - } - } -@@ -5298,8 +5304,10 @@ static int GetName(DecodedCert* cert, int nameType) - dName->uidLen = adv; - - #ifdef OPENSSL_EXTRA -- /* store order that DN was parsed */ -- dName->loc[count++] = ASN_USER_ID; -+ if (count < DOMAIN_COMPONENT_MAX) { -+ /* store order that DN was parsed */ -+ dName->loc[count++] = ASN_USER_ID; -+ } - #endif - #endif /* OPENSSL_EXTRA */ - break; -@@ -5315,8 +5323,10 @@ static int GetName(DecodedCert* cert, int nameType) - dcnum++; - - #ifdef OPENSSL_EXTRA -- /* store order that DN was parsed */ -- dName->loc[count++] = ASN_DOMAIN_COMPONENT; -+ if (count < DOMAIN_COMPONENT_MAX) { -+ /* store order that DN was parsed */ -+ dName->loc[count++] = ASN_DOMAIN_COMPONENT; -+ } - #endif - #endif /* OPENSSL_EXTRA */ - break; --- -2.20.1 - diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index c1b7972c5b24..5509552ca4e3 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 3562af485c26cd7abe94d9404fbfc0c5c9bceb4aab29b81ebf5e6c2467507e12 wolfssl-4.2.0-stable.tar.gz +sha256 6896f8ad6c44aff3e583006eeee839600848a0e37118ebbb7514eca9409ae08b wolfssl-4.3.0-stable.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index f8ec4bd1ba98..8834a0f46826 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -WOLFSSL_VERSION = 4.2.0-stable +WOLFSSL_VERSION = 4.3.0-stable WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)) WOLFSSL_INSTALL_STAGING = YES