aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/openvpn/patches/300-upstream-fix-polarssl-mbedtls-builds.patch
diff options
context:
space:
mode:
authorMagnus Kroken <mkroken@gmail.com>2016-08-24 00:14:46 +0200
committerJo-Philipp Wich <jo@mein.io>2016-08-24 00:33:08 +0200
commit2653a12c4d5d9c0f600a9d06667aaa3bc55c8756 (patch)
treef9e062c618103cf3a00c69a792caafb583d1c263 /package/network/services/openvpn/patches/300-upstream-fix-polarssl-mbedtls-builds.patch
parentdf047234786ce61c3fd36bf9cf098d21737ae199 (diff)
downloadupstream-2653a12c4d5d9c0f600a9d06667aaa3bc55c8756.tar.gz
upstream-2653a12c4d5d9c0f600a9d06667aaa3bc55c8756.tar.bz2
upstream-2653a12c4d5d9c0f600a9d06667aaa3bc55c8756.zip
openvpn: update to 2.3.12
300-upstream-fix-polarssl-mbedtls-builds.patch has been applied upstream. Replaced 101-remove_polarssl_debug_call.patch with upstream backport. Changelog: https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.12 Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Diffstat (limited to 'package/network/services/openvpn/patches/300-upstream-fix-polarssl-mbedtls-builds.patch')
-rw-r--r--package/network/services/openvpn/patches/300-upstream-fix-polarssl-mbedtls-builds.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/package/network/services/openvpn/patches/300-upstream-fix-polarssl-mbedtls-builds.patch b/package/network/services/openvpn/patches/300-upstream-fix-polarssl-mbedtls-builds.patch
deleted file mode 100644
index 0a5c49c791..0000000000
--- a/package/network/services/openvpn/patches/300-upstream-fix-polarssl-mbedtls-builds.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 629baad8f89af261445a2ace03694601f8e476f9 Mon Sep 17 00:00:00 2001
-From: Steffan Karger <steffan@karger.me>
-Date: Fri, 13 May 2016 08:54:52 +0200
-Subject: [PATCH] Fix polarssl / mbedtls builds
-
-Commit 8a399cd3 hardened the OpenSSL default cipher list,
-but also introduced a change in shared code that causes
-polarssl / mbedtls builds to break when no --tls-cipher is
-specified.
-
-This fix is backported code from the master branch.
-
-Signed-off-by: Steffan Karger <steffan@karger.me>
-Acked-by: Gert Doering <gert@greenie.muc.de>
-Message-Id: <1463122492-701-1-git-send-email-steffan@karger.me>
-URL: http://article.gmane.org/gmane.network.openvpn.devel/11647
-Signed-off-by: Gert Doering <gert@greenie.muc.de>
----
- src/openvpn/ssl_polarssl.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/openvpn/ssl_polarssl.c b/src/openvpn/ssl_polarssl.c
-index 1f58369..9263698 100644
---- a/src/openvpn/ssl_polarssl.c
-+++ b/src/openvpn/ssl_polarssl.c
-@@ -176,7 +176,12 @@ tls_ctx_restrict_ciphers(struct tls_root_ctx *ctx, const char *ciphers)
- {
- char *tmp_ciphers, *tmp_ciphers_orig, *token;
- int i, cipher_count;
-- int ciphers_len = strlen (ciphers);
-+ int ciphers_len;
-+
-+ if (NULL == ciphers)
-+ return; /* Nothing to do */
-+
-+ ciphers_len = strlen (ciphers);
-
- ASSERT (NULL != ctx);
- ASSERT (0 != ciphers_len);
---
-2.8.1
-