[Buildroot] [PATCH 1/1] package/openvpn: add mbedtls support
Fabrice Fontaine
fontaine.fabrice at gmail.com
Thu Oct 29 16:04:03 UTC 2020
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 <fontaine.fabrice at gmail.com>
---
package/openvpn/Config.in | 2 +-
package/openvpn/openvpn.mk | 9 ++++++++-
2 files changed, 9 insertions(+), 2 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..9ae2396b92 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -12,7 +12,6 @@ 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
--
2.28.0
More information about the buildroot
mailing list