Skip to content

Commit fb9d689

Browse files
committed
openvpn: update to 2.7_rc4
The new DCO module depends on OpenVPN 2.7. For details refer to https://github.com/OpenVPN/openvpn/blob/v2.7_rc4/Changes.rst Removed upstreamed wolfSSL patches: - 101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch - 102-Disable-external-ec-key-support-when-building-with-wolfSSL.patch Reworked 100-mbedtls-disable-runtime-version-check.patch to use MBEDTLS_VERSION_STRING instead of a mutable buffer. Signed-off-by: Qingfang Deng <dqfext@gmail.com>
1 parent fc09a9d commit fb9d689

5 files changed

+14
-50
lines changed

net/openvpn/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=openvpn
1111

12-
PKG_VERSION:=2.6.14
13-
PKG_RELEASE:=4
12+
PKG_VERSION:=2.7_rc4
13+
PKG_RELEASE:=1
1414

1515
PKG_SOURCE_URL:=\
1616
https://build.openvpn.net/downloads/releases/ \
1717
https://swupdate.openvpn.net/community/releases/
1818
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
19-
PKG_HASH:=9eb6a6618352f9e7b771a9d38ae1631b5edfeed6d40233e243e602ddf2195e7a
19+
PKG_HASH:=1fb6876a97ad7731e53a2301ab7f2010937e646987797ff9c1d1545b7098273d
2020

2121
PKG_MAINTAINER:=
2222

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
--- a/src/openvpn/ssl_mbedtls.c
22
+++ b/src/openvpn/ssl_mbedtls.c
3-
@@ -1616,7 +1616,7 @@ const char *
3+
@@ -1475,11 +1475,7 @@ show_available_curves(void)
4+
const char *
45
get_ssl_library_version(void)
56
{
6-
static char mbedtls_version[30];
7+
- static char mbedtls_version[30];
78
- unsigned int pv = mbedtls_version_get_number();
8-
+ unsigned int pv = MBEDTLS_VERSION_NUMBER;
9-
snprintf(mbedtls_version, sizeof(mbedtls_version), "mbed TLS %d.%d.%d",
10-
(pv>>24)&0xff, (pv>>16)&0xff, (pv>>8)&0xff );
11-
return mbedtls_version;
9+
- snprintf(mbedtls_version, sizeof(mbedtls_version), "mbed TLS %d.%d.%d", (pv >> 24) & 0xff,
10+
- (pv >> 16) & 0xff, (pv >> 8) & 0xff);
11+
- return mbedtls_version;
12+
+ return "mbed TLS " MBEDTLS_VERSION_STRING;
13+
}
14+
15+
void

net/openvpn/patches/101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

net/openvpn/patches/102-Disable-external-ec-key-support-when-building-with-wolfSSL.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

net/openvpn/patches/103-define-LN_serialNumber-for-wolfSSL.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/openvpn/ssl_verify_openssl.c
22
+++ b/src/openvpn/ssl_verify_openssl.c
3-
@@ -267,6 +267,9 @@ backend_x509_get_username(char *common_n
3+
@@ -260,6 +260,9 @@ backend_x509_get_username(char *common_n
44
return FAILURE;
55
}
66
}

0 commit comments

Comments
 (0)