From patchwork Thu Jun 27 21:54:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joris OFFOUGA X-Patchwork-Id: 1123720 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jycxlLvY"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45ZYbJ20h4z9s3Z for ; Fri, 28 Jun 2019 07:54:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0D1198443F; Thu, 27 Jun 2019 21:54:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rl-2dQjIaHrE; Thu, 27 Jun 2019 21:54:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id AAB4B8475F; Thu, 27 Jun 2019 21:54:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 799F01BF399 for ; Thu, 27 Jun 2019 21:54:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 739471FD45 for ; Thu, 27 Jun 2019 21:54:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SBYwQU6-2moQ for ; Thu, 27 Jun 2019 21:54:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by silver.osuosl.org (Postfix) with ESMTPS id 850C41FD21 for ; Thu, 27 Jun 2019 21:54:46 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id g135so7124933wme.4 for ; Thu, 27 Jun 2019 14:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=W7TsAiixz7oaDovhCCak4Ba9b01l48+YM7lp5N3KDFc=; b=jycxlLvYPgyMe6BclBC2EHG+eJQdAK45rNlFJjDuCfbSqcNR+HZ+av8JWduShAmHqO GzthqIR7s/dEV7Oh273Qa3kQ1kFKbGIJIZjYZksUfsPgVwWvO4hkJ6GEvhXFllYkZwfW autunudbxtzIwr0w05rzZyTQ7leWoLzHMrI4pqsTuWLEyK6Old0r5VQSstCgbshG+QEI jrN6r+h+Sk97Eq4mmf6vUadrAOelWyeoYw107Zlkg1XtiVQDF2Sl68AU81L1cgMAZEBt 6BOR4lBi/dcxQb39ZgrWvxYxvrFY9C8ot1AhBf8fg/A4HNJKt61oOuy8n57C5tyjrfvI mjOg== 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; bh=W7TsAiixz7oaDovhCCak4Ba9b01l48+YM7lp5N3KDFc=; b=fyen5CeuJvahpg89QHQ6jbYBu+o6LJqaNBxSamyshhEr2DBEgSLTy/DPsXPVCN6DpC I51cEbPC9t4MAKL6IcUAokMbFixqaBE9qveTGf1pnjsqJF785uIpi9K6J2WeiIWZsByZ E5R/z8hNiPcijjSc5GLnUi8e4gETC30syl4ke45/Ne1ApxwAOayL+nqwaC7eW2LthxS4 DGUO4Vi3ehmN9opnSZr9jrk8jFwJgBgdz+r4vmC+ncZpXeMVxcANKaAmf4rTgmLmkgvF /xM1hgLoSXDfBudwycI+St41adLb9BNYLB4gb0BipI/DQ2NLeSUEihMT+oT6l0Ga/SFF 6Puw== X-Gm-Message-State: APjAAAVSMVAjfyhxWQ5/LyOBTGjs3dfk5k6SDJ8QPbPd0au0sNacN6H+ l9+R3DxVmBqyiLq+8ZIhImEWvgPkObE= X-Google-Smtp-Source: APXvYqzHxyCg9n2UIv5pvGKh2mUjuaOGLmsoA5RL5Q0fFTy1VK5urdu4VbmOW7EH10zhQvbpm4bTgg== X-Received: by 2002:a7b:c051:: with SMTP id u17mr4465179wmc.25.1561672484736; Thu, 27 Jun 2019 14:54:44 -0700 (PDT) Received: from furher.home ([2a01:cb19:16b:9900:7978:6c28:61b5:9af7]) by smtp.gmail.com with ESMTPSA id n3sm241830wro.59.2019.06.27.14.54.43 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 14:54:44 -0700 (PDT) From: Joris Offouga To: buildroot@buildroot.org Date: Thu, 27 Jun 2019 23:54:36 +0200 Message-Id: <20190627215437.32571-1-offougajoris@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH] package/mbedtls: bump version to 2.16.2 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: Pierre-Jean Texier , Joris Offouga , Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" See changelog: https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.2-and-2.7.11-released Fixes: - http://autobuild.buildroot.net/results/7c0/7c09c80a376cf0c4c23a3cf48314806de9251544/ Also add a patch to fix the build issue by requiring at least ARMv6 in addition to the DSP feature. Signed-off-by: Joris Offouga Signed-off-by: Pierre-Jean Texier --- ...-at-least-ARMv6-to-enable-the-ARM-DS.patch | 38 +++++++++++++++++++ package/mbedtls/mbedtls.hash | 6 +-- package/mbedtls/mbedtls.mk | 2 +- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 package/mbedtls/0002-bn_mul.h-require-at-least-ARMv6-to-enable-the-ARM-DS.patch diff --git a/package/mbedtls/0002-bn_mul.h-require-at-least-ARMv6-to-enable-the-ARM-DS.patch b/package/mbedtls/0002-bn_mul.h-require-at-least-ARMv6-to-enable-the-ARM-DS.patch new file mode 100644 index 0000000000..ee66be4b21 --- /dev/null +++ b/package/mbedtls/0002-bn_mul.h-require-at-least-ARMv6-to-enable-the-ARM-DS.patch @@ -0,0 +1,38 @@ +From 63f5b85e700677270197d176475be609187e9cdb Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Sat, 3 Nov 2018 00:46:06 +0100 +Subject: [PATCH] bn_mul.h: require at least ARMv6 to enable the ARM DSP code + +Commit 16b1bd89326e "bn_mul.h: add ARM DSP optimized MULADDC code" +added some ARM DSP instructions that was assumed to always be available +when __ARM_FEATURE_DSP is defined to 1. Unfortunately it appears that +the ARMv5TE architecture (GCC flag -march=armv5te) supports the DSP +instructions, but only in Thumb mode and not in ARM mode, despite +defining __ARM_FEATURE_DSP in both cases. + +This patch fixes the build issue by requiring at least ARMv6 in addition +to the DSP feature. + +[Upstream status: https://github.com/ARMmbed/mbedtls/pull/2169] +Signed-off-by: Pierre-Jean Texier +--- + include/mbedtls/bn_mul.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h +index 0af694c..565615f 100644 +--- a/include/mbedtls/bn_mul.h ++++ b/include/mbedtls/bn_mul.h +@@ -636,7 +636,8 @@ + "r6", "r7", "r8", "r9", "cc" \ + ); + +-#elif defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1) ++#elif (__ARM_ARCH >= 6) && \ ++ defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1) + + #define MULADDC_INIT \ + asm( +-- +2.7.4 + diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 57a5aeffcb..1e65f8224a 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,5 +1,5 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.0-2.7.9-and-2.1.18-released -sha1 70dc65f3f6f6b2392b821163be7f1f634f0012c8 mbedtls-2.7.9-apache.tgz -sha256 18e57260b46579245744adb79c2924194dad36aac38c2d0be9e749b9181c706f mbedtls-2.7.9-apache.tgz +# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.2-and-2.7.11-released +sha1 ba809acfd4b41b86895b92e98d936695b5b62b73 mbedtls-2.16.2-apache.tgz +sha256 a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4 mbedtls-2.16.2-apache.tgz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 4a5a731d42..fdf1d33b2e 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.7.9 +MBEDTLS_VERSION = 2.16.2 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \