From patchwork Tue Dec 28 15:33:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1573758 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=fxHB08QA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JNdrk33kMz9s3q for ; Wed, 29 Dec 2021 02:35:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 11A7960AF7; Tue, 28 Dec 2021 15:34:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 40eF7DLA9S_G; Tue, 28 Dec 2021 15:34:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 6F1B860AF1; Tue, 28 Dec 2021 15:34:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5D4CD1BF2BD for ; Tue, 28 Dec 2021 15:34:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4C8E540325 for ; Tue, 28 Dec 2021 15:34:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GHzmJNjuIGP0 for ; Tue, 28 Dec 2021 15:34:53 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by smtp4.osuosl.org (Postfix) with ESMTPS id 375E0402FE for ; Tue, 28 Dec 2021 15:34:53 +0000 (UTC) Received: by mail-wm1-x334.google.com with SMTP id l4so11853872wmq.3 for ; Tue, 28 Dec 2021 07:34:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MEvfhvfLFTUy/nFJODsHeMVUAdbzCTDppUTP8QmGBgw=; b=fxHB08QAvlF4H2pzRSCu4FKx/Z0l8AWfQXGbGqqv7Fwnd+y+gHzoeSyDCH/QBPzM4Q T+B3r3JB1LxKsqxYAR5EMcUOCQJjf4Vbkrjm8TrKdBr4uw28Hgc85LTipCVXIfYwS7vM o96VFe+Dy24bqTopkrOdkmvokWSqbosqSzlVUPGXTWCoiyZ0KaR7EmnHdL1wcY4rqjRl L+Agl0UoF/27Q29SgcBMkNgCQvobq2FHIKb7o5xX2kMiUpIP01/cmM8RG9R72Ooi2A+n XiMT/nF8JHlZqssqyMwqYXM1GfKTOSuNT/nJ2r2QLINdbkva93aqjWHagFSTUiUjEmsp +/zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MEvfhvfLFTUy/nFJODsHeMVUAdbzCTDppUTP8QmGBgw=; b=eN3g4Em7Sd0ZZQF6th9LxTEny96AYfF1a12JPQ10w3ZaEUysStRrQxY8O2Sumiz7WP KNSSrTO4toaxIFpMt1F3G5rwwFbgyonKeF7FXf/RG3YT9DtDwOkIZG0Cfg5TT2S80cZg Nmdcv6QmimH6Z/IcZSsxE1j1ABi4j2K8ofS6MI2HoxpUCEClgmfECXeLixjGlW7L95im +Rx9FAWzxgHAyWA9ViKZeSTgtO4a7rjeABPcXvy8KJEzG1dpFL0V8NBgTNRsvICUoyMD JDf92T6GhruV6UtfnBP5Emd6rYazRP3MgM7ppMFUQq82aJ7Tl92Gvq1qH0G5+I4sW3tW k4sw== X-Gm-Message-State: AOAM531UJcrWHX+9lg0Xki7HxmIg97BCNxXoJPf40KSUbm1oMVg+QLxW 4x9ua1EDFRf+ABAAX+utax3VWkefFHDfPA== X-Google-Smtp-Source: ABdhPJwDAL57uRBeOwlrAPRzvq4xfR3eRnDMmwwTV2BboyF2eVdXessZNqxoZyRJyN8nBtOETzV/fQ== X-Received: by 2002:a05:600c:1e24:: with SMTP id ay36mr18056722wmb.84.1640705691313; Tue, 28 Dec 2021 07:34:51 -0800 (PST) Received: from kali.home (lfbn-ren-1-2129-201.w92-167.abo.wanadoo.fr. [92.167.208.201]) by smtp.gmail.com with ESMTPSA id p13sm17233573wrr.37.2021.12.28.07.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Dec 2021 07:34:51 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 28 Dec 2021 16:33:44 +0100 Message-Id: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/mbedtls3: new package X-BeenThere: buildroot@buildroot.org 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: Samuel Martin , Fabrice Fontaine , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" mbedtls 3.x is incompatible with mbedtls 2.x: https://github.com/ARMmbed/mbedtls/blob/development/docs/3.0-migration-guide.md mbedtls3 was created from mbedtls package with the following changes: - license file is now LICENSE - zlib compression is not available anymore - config.h renamed to mbedtls_config.h Signed-off-by: Fabrice Fontaine --- DEVELOPERS | 1 + package/Config.in | 1 + package/mbedtls3/Config.in | 21 ++++++++++++ package/mbedtls3/mbedtls3.hash | 4 +++ package/mbedtls3/mbedtls3.mk | 61 ++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 package/mbedtls3/Config.in create mode 100644 package/mbedtls3/mbedtls3.hash create mode 100644 package/mbedtls3/mbedtls3.mk diff --git a/DEVELOPERS b/DEVELOPERS index 29390b0cc1..5604a1dd56 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -900,6 +900,7 @@ F: package/libupnp/ F: package/libv4l/ F: package/libxslt/ F: package/mbedtls/ +F: package/mbedtls3/ F: package/minissdpd/ F: package/minizip/ F: package/mongodb/ diff --git a/package/Config.in b/package/Config.in index 2635cc4b3c..422eff525d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1419,6 +1419,7 @@ menu "Crypto" source "package/libuecc/Config.in" source "package/libxcrypt/Config.in" source "package/mbedtls/Config.in" + source "package/mbedtls3/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" source "package/pkcs11-helper/Config.in" diff --git a/package/mbedtls3/Config.in b/package/mbedtls3/Config.in new file mode 100644 index 0000000000..83981bdf23 --- /dev/null +++ b/package/mbedtls3/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_MBEDTLS3 + bool "mbedtls3" + depends on !BR2_PACKAGE_MBEDTLS + help + mbed TLS (formerly known as PolarSSL) makes it trivially easy + for developers to include cryptographic and SSL/TLS + capabilities in their (embedded) products, facilitating this + functionality with a minimal coding footprint. + + https://tls.mbed.org/ + +if BR2_PACKAGE_MBEDTLS3 + +config BR2_PACKAGE_MBEDTLS3_PROGRAMS + bool "mbedtls programs" + depends on BR2_USE_MMU # fork() + help + This option enables the installation and the build of + mbed TLS companion programs. + +endif diff --git a/package/mbedtls3/mbedtls3.hash b/package/mbedtls3/mbedtls3.hash new file mode 100644 index 0000000000..6da1030bff --- /dev/null +++ b/package/mbedtls3/mbedtls3.hash @@ -0,0 +1,4 @@ +# From https://github.com/ARMmbed/mbedtls/releases/tag/v3.1.0: +sha256 b02df6f68dd1537e115a8497d5c173dc71edc55ad084756e57a30f951b725acd mbedtls3-3.1.0.tar.gz +# Locally calculated +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls3/mbedtls3.mk b/package/mbedtls3/mbedtls3.mk new file mode 100644 index 0000000000..c49b92aa9e --- /dev/null +++ b/package/mbedtls3/mbedtls3.mk @@ -0,0 +1,61 @@ +################################################################################ +# +# mbedtls3 +# +################################################################################ + +MBEDTLS3_VERSION = 3.1.0 +MBEDTLS3_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS3_VERSION)) +MBEDTLS3_CONF_OPTS = \ + -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS3_PROGRAMS),ON,OFF) \ + -DENABLE_TESTING=OFF +MBEDTLS3_INSTALL_STAGING = YES +MBEDTLS3_LICENSE = Apache-2.0 +MBEDTLS3_LICENSE_FILES = LICENSE +MBEDTLS3_CPE_ID_VENDOR = arm +MBEDTLS3_CPE_ID_PRODUCT = mbed_tls + +# This is mandatory for hiawatha +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +define MBEDTLS3_ENABLE_THREADING + $(SED) "s://#define MBEDTLS_THREADING_C:#define MBEDTLS_THREADING_C:" \ + $(@D)/include/mbedtls/mbedtls_config.h + $(SED) "s://#define MBEDTLS_THREADING_PTHREAD:#define MBEDTLS_THREADING_PTHREAD:" \ + $(@D)/include/mbedtls/mbedtls_config.h +endef +MBEDTLS3_POST_PATCH_HOOKS += MBEDTLS3_ENABLE_THREADING +ifeq ($(BR2_STATIC_LIBS),y) +MBEDTLS3_CONF_OPTS += -DLINK_WITH_PTHREAD=ON +endif +endif + +ifeq ($(BR2_STATIC_LIBS),y) +MBEDTLS3_CONF_OPTS += \ + -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +MBEDTLS3_CONF_OPTS += \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=ON +else ifeq ($(BR2_SHARED_LIBS),y) +MBEDTLS3_CONF_OPTS += \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=OFF +endif + +define MBEDTLS3_DISABLE_ASM + $(SED) '/^#define MBEDTLS_AESNI_C/d' \ + $(@D)/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_HAVE_ASM/d' \ + $(@D)/include/mbedtls/mbedtls_config.h + $(SED) '/^#define MBEDTLS_PADLOCK_C/d' \ + $(@D)/include/mbedtls/mbedtls_config.h +endef + +# ARM in thumb mode breaks debugging with asm optimizations +# Microblaze asm optimizations are broken in general +# MIPS R6 asm is not yet supported +ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) +MBEDTLS3_POST_CONFIGURE_HOOKS += MBEDTLS3_DISABLE_ASM +else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +MBEDTLS3_POST_CONFIGURE_HOOKS += MBEDTLS3_DISABLE_ASM +endif + +$(eval $(cmake-package)) From patchwork Tue Dec 28 15:33:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1573759 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=oqK4YCh5; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JNdrv1lxMz9s3q for ; Wed, 29 Dec 2021 02:35:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 16AEF81766; Tue, 28 Dec 2021 15:35:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OAR-P7v3Ji2X; Tue, 28 Dec 2021 15:35:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 7BD4181764; Tue, 28 Dec 2021 15:35:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 507881BF2BD for ; Tue, 28 Dec 2021 15:34:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3F8C560B01 for ; Tue, 28 Dec 2021 15:34:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4WV-8rEcdqZR for ; Tue, 28 Dec 2021 15:34:56 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by smtp3.osuosl.org (Postfix) with ESMTPS id 4CB6460AF7 for ; Tue, 28 Dec 2021 15:34:56 +0000 (UTC) Received: by mail-wm1-x334.google.com with SMTP id g132so11866678wmg.2 for ; Tue, 28 Dec 2021 07:34:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=35mElcja/G2NoiZjI5LlsZQUIyjuKdOrEGjMDotGSLA=; b=oqK4YCh5IfDJxQi9d8sn9OJTHlWztSClPDQF/2mJwNQMlCoLQ14fSDITXN1f4jdRmd 59FrnPuz9RiF2jMMv2sho8CTFBUjxhMQjdO1Q9NtDVvT1AvAucbdpbsK2MFHQrbkRuvL 6wxVr7tDy3vh9QgnQeHUUiBoxpIqsgL/83kOqV8KnOTRqkMkUEw7qTN3rc8bFtATCBOo eehb3PaI2DbWQiXypY9YJCKZzesRxeXCVrB1kuy0OYD4SiFbzE9RDWHqqtRB2qCDql3k dU2PIYDsVDnVtUNBVv9/oYkuJ0eQ23tfxREpPq005ZHTPvUAA+FqBShRjPcsDilJ6ymW vH+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=35mElcja/G2NoiZjI5LlsZQUIyjuKdOrEGjMDotGSLA=; b=X72oWPOGD6V0E/eDxUO6tnBLOZIk+KuqZ+zIwdvunYQ4F/vLii+EpzbUpmoGlxAjAy WxNCoDH+zA7T35f3Amsde+HMTqxUdfFf5iYoI+ezkZ+BDzTjYN4cR2ST/9cAT0sBkvjW b+HOjCKT5rnY0PrxkmcR9oypAFHCcbzeYVtnaiplvMBp0qPfD1OGgPRW6Gkb04V5B75/ 1oSBsXkiBYf3oqiVjtpR62Hbs0ym28IoJaUrzIcnUg0Q6pu28ervD9P2ijtYAMHqODFk whuDE6E4K/Qe3P+EGyG7wFuAklCcCwln9yM/gdRmifY7FHfpH9r7nfY+0T96xSCs6xUw q2vw== X-Gm-Message-State: AOAM533migwO028Sn1igZme7Hy5b/cuO3RE6hjM5tmvRglqufh9xuk7Q ccwkdwOxGhjGJCYVoccwi1pSrRQMoS0ELw== X-Google-Smtp-Source: ABdhPJyY+qXtt9KCajslV4CgexYlK+0+OFmPgPvqqpc46j0ag0t54wBYG/SBlthqaiz/nfMmN25yQA== X-Received: by 2002:a05:600c:4e15:: with SMTP id b21mr17907614wmq.91.1640705694390; Tue, 28 Dec 2021 07:34:54 -0800 (PST) Received: from kali.home (lfbn-ren-1-2129-201.w92-167.abo.wanadoo.fr. [92.167.208.201]) by smtp.gmail.com with ESMTPSA id p13sm17233573wrr.37.2021.12.28.07.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Dec 2021 07:34:54 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 28 Dec 2021 16:33:45 +0100 Message-Id: <20211228153345.4087026-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> References: <20211228153345.4087026-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/hiawatha: needs mbedtls3 X-BeenThere: buildroot@buildroot.org 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: Samuel Martin , Fabrice Fontaine , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" hiawatha needs mbedtls3 since bump to version 11.1 in commit 24e4c888c3d36e3943206ea55894b84344cc8b2e: /home/giuliobenetti/autobuild/run/instance-3/output-1/build/hiawatha-11.1/src/wigwam.c:39:10: fatal error: mbedtls/psa_util.h: No such file or directory 39 | #include "mbedtls/psa_util.h" | ^~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/064af90aa95c28781d96d7eca0f14841fce0687a Signed-off-by: Fabrice Fontaine --- package/hiawatha/Config.in | 3 ++- package/hiawatha/hiawatha.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 8f1908f6f4..94737bf318 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -32,6 +32,7 @@ if BR2_PACKAGE_HIAWATHA config BR2_PACKAGE_HIAWATHA_SSL bool "hiawatha TLS support" - select BR2_PACKAGE_MBEDTLS + depends on !BR2_PACKAGE_MBEDTLS + select BR2_PACKAGE_MBEDTLS3 endif diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 5618e6900d..8f975813a5 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -21,7 +21,7 @@ HIAWATHA_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON -HIAWATHA_DEPENDENCIES += mbedtls +HIAWATHA_DEPENDENCIES += mbedtls3 else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif