mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/openvpn: add mbedtls support

Browse Source 
mbedtls (former polarssl) support was dropped with commit
3380da69c5

Put it back as openvpn supports mbedtls 2.x since version 2.4.0 and
86d8cd6860

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2020-10-29 18:35:56 +01:00
committed by Peter Korsgaard
parent dc13aac3b9
commit b11f92ff0e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/openvpn/Config.in
View File

@@ -1,7 +1,7 @@
config BR2_PACKAGE_OPENVPN config BR2_PACKAGE_OPENVPN
bool "openvpn" bool "openvpn"
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
help help
OpenVPN is a full-featured SSL VPN solution which can OpenVPN is a full-featured SSL VPN solution which can
accomodate a wide range of configurations, including road accomodate a wide range of configurations, including road

11
package/openvpn/openvpn.mk
View File

@@ -7,12 +7,11 @@
OPENVPN_VERSION = 2.4.9 OPENVPN_VERSION = 2.4.9
OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz
OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
OPENVPN_DEPENDENCIES = host-pkgconf openssl OPENVPN_DEPENDENCIES = host-pkgconf
OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE = GPL-2.0
OPENVPN_LICENSE_FILES = COPYRIGHT.GPL OPENVPN_LICENSE_FILES = COPYRIGHT.GPL
OPENVPN_CONF_OPTS = \ OPENVPN_CONF_OPTS = \
--enable-iproute2 \ --enable-iproute2 \
--with-crypto-library=openssl \
$(if $(BR2_STATIC_LIBS),--disable-plugins) $(if $(BR2_STATIC_LIBS),--disable-plugins)
OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \ OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
NETSTAT=/bin/netstat \ NETSTAT=/bin/netstat \
@@ -51,6 +50,14 @@ else
OPENVPN_CONF_OPTS += --disable-plugin-auth-pam OPENVPN_CONF_OPTS += --disable-plugin-auth-pam
endif 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) ifeq ($(BR2_PACKAGE_PKCS11_HELPER),y)
OPENVPN_DEPENDENCIES += pkcs11-helper OPENVPN_DEPENDENCIES += pkcs11-helper
OPENVPN_CONF_OPTS += --enable-pkcs11 OPENVPN_CONF_OPTS += --enable-pkcs11