From patchwork Thu Oct 29 17:35:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1390304 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=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.a=rsa-sha256 header.s=20161025 header.b=Bi4ujX5W; 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 4CMXfg4939z9sRK for ; Fri, 30 Oct 2020 04:36:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3839D86403; Thu, 29 Oct 2020 17:36:09 +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 9bdi3CLG5pWe; Thu, 29 Oct 2020 17:36:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id AC16786B7E; Thu, 29 Oct 2020 17:36:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 113EF1BF2A5 for ; Thu, 29 Oct 2020 17:36:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8A16682713 for ; Thu, 29 Oct 2020 17:36:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 31D34H+s6EJE for ; Thu, 29 Oct 2020 17:36:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9665C8758A for ; Thu, 29 Oct 2020 17:36:05 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id m13so3690629wrj.7 for ; Thu, 29 Oct 2020 10:36:05 -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:mime-version :content-transfer-encoding; bh=f46EYTPJe/NvvqsARTz02jUDhF0ufcq40yxu/fkdN14=; b=Bi4ujX5WkjuHrqy30StG+33KoWBKEbUmCQt+AUcnsrTrM8z3uQXCovtMxtvc9PemD3 QLvekpHnIv9i5yzE0HiJzmuqfL0C1oF+ngFkbXmYNOE8rhFZVpby7NW3FTu0xEHtv8Q4 5aD+fQMnBN19HuqKlk4mcrjNhFI9pqOFe2qFi7gVkNRfTDzUOAquND7v3mpbwAyOGJWg LJ81daWcBftavyWmYfUKKR8pQm8igyVOul3SRaPEYcrAAwDLWO5swK3R3dFtMd9dzNHN xgzfsI/awPqlwHFSBk46u579mzmC+olaby/KzfG7XLU2+romid6Xa8RPUDOvgIhbpsAa A8VQ== 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=f46EYTPJe/NvvqsARTz02jUDhF0ufcq40yxu/fkdN14=; b=kXVjaR8uUdL6QKms235kzG1yWSOvojpgSngCeuUjK41ogU5NIZU/tx+uA9th+85rL4 b0O/OknL2gTRQ+ovVZXxqQSAiIe22kbm3CAVvK7ymcSz9IIH28k/fwVUdV1cjZqStjVQ MWfdYseMW/fb9lnt9HhmdQmSlvMSoIUhbjYqRm2sSEZjv1DF6ZfcWHKEW+L4zuZxvRYx /4Jcmti6VBUFZw+Spuhs9MDVAx8vWfPacvaQZk4i1SySTLqJjYgzvGKg12ggGEuk1Z74 oL4CdukvyfxpWgzNuZYYKLqFw+3z9sKUGBJ8BOORnDQYaO85GEYf+imlH+jWXuGzrgrm ILfg== X-Gm-Message-State: AOAM531tamQj9luJg9i8GGnns2TgKrxwBWFCnU3o/+TID9X83udEQqVo ATpc9tiy79IgTx2oTc1e3Lf+ylFm/TE= X-Google-Smtp-Source: ABdhPJwoIJlxDX/j7fAjaTOjak6zGYoGYkS9ESp8rKeBBQGnqz4/2xhXjWqnrbgRoUZk1yn4ESm8DA== X-Received: by 2002:a5d:6605:: with SMTP id n5mr6961685wru.355.1603992963736; Thu, 29 Oct 2020 10:36:03 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id f17sm875596wmh.10.2020.10.29.10.36.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 10:36:02 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 29 Oct 2020 18:35:56 +0100 Message-Id: <20201029173556.506699-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2,1/1] package/openvpn: add mbedtls support 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: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" mbedtls (former polarssl) support was dropped with commit 3380da69c5ab490e5c51dca0c4389b0da91743d0 Put it back as openvpn supports mbedtls 2.x since version 2.4.0 and https://github.com/OpenVPN/openvpn/commit/86d8cd6860dfc74cb1a040ff8fe03140ebe7f930 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Remove openssl from openvpn mandatory dependencies package/openvpn/Config.in | 2 +- package/openvpn/openvpn.mk | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index 0a1675573a..3f4a617fb7 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_OPENVPN bool "openvpn" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS help OpenVPN is a full-featured SSL VPN solution which can accomodate a wide range of configurations, including road diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 4234675d9f..1008c47b5a 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -7,12 +7,11 @@ OPENVPN_VERSION = 2.4.9 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases -OPENVPN_DEPENDENCIES = host-pkgconf openssl +OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL OPENVPN_CONF_OPTS = \ --enable-iproute2 \ - --with-crypto-library=openssl \ $(if $(BR2_STATIC_LIBS),--disable-plugins) OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \ NETSTAT=/bin/netstat \ @@ -51,6 +50,14 @@ else OPENVPN_CONF_OPTS += --disable-plugin-auth-pam endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OPENVPN_DEPENDENCIES += openssl +OPENVPN_CONF_OPTS += --with-crypto-library=openssl +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +OPENVPN_DEPENDENCIES += mbedtls +OPENVPN_CONF_OPTS += --with-crypto-library=mbedtls +endif + ifeq ($(BR2_PACKAGE_PKCS11_HELPER),y) OPENVPN_DEPENDENCIES += pkcs11-helper OPENVPN_CONF_OPTS += --enable-pkcs11