diff --git a/net/openvpn/Config-wolfssl.in b/net/openvpn/Config-wolfssl.in index bd076460a2..66bb67caee 100644 --- a/net/openvpn/Config-wolfssl.in +++ b/net/openvpn/Config-wolfssl.in @@ -45,6 +45,7 @@ config OPENVPN_wolfssl_ENABLE_DCO depends on !OPENVPN_wolfssl_ENABLE_IPROUTE2 bool "Enable support for data channel offload" default n if OPENVPN_openssl_ENABLE_IPROUTE2 + select WOLFSSL_HAS_OPENVPN help enable data channel offload support using the ovpn-dco-v2 kernel module diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index fb12a4b49e..a6a44b48bc 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn -PKG_VERSION:=2.6.10 +PKG_VERSION:=2.6.11 PKG_RELEASE:=1 PKG_SOURCE_URL:=\ https://build.openvpn.net/downloads/releases/ \ https://swupdate.openvpn.net/community/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b +PKG_HASH:=d60adf413d37e11e6e63531cacf2655906756046b4edffe88a13b9e2fec40d5e PKG_MAINTAINER:= diff --git a/net/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch b/net/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch index 4831de9c71..c327166ab6 100644 --- a/net/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch +++ b/net/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch @@ -6,6 +6,6 @@ static char mbedtls_version[30]; - unsigned int pv = mbedtls_version_get_number(); + unsigned int pv = MBEDTLS_VERSION_NUMBER; - sprintf( mbedtls_version, "mbed TLS %d.%d.%d", + snprintf(mbedtls_version, sizeof(mbedtls_version), "mbed TLS %d.%d.%d", (pv>>24)&0xff, (pv>>16)&0xff, (pv>>8)&0xff ); return mbedtls_version; diff --git a/net/openvpn/patches/101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch b/net/openvpn/patches/101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch index e5b103bc59..264c28b4b8 100644 --- a/net/openvpn/patches/101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch +++ b/net/openvpn/patches/101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch @@ -9,7 +9,7 @@ #include #endif #if OPENSSL_VERSION_NUMBER >= 0x30000000L -@@ -1374,7 +1374,7 @@ memcmp_constant_time(const void *a, cons +@@ -1398,7 +1398,7 @@ memcmp_constant_time(const void *a, cons return CRYPTO_memcmp(a, b, size); }