summaryrefslogtreecommitdiff
path: root/security/openvpn/files/patch-629baad8
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2016-08-24 22:33:25 +0000
committerMatthias Andree <mandree@FreeBSD.org>2016-08-24 22:33:25 +0000
commitc12684409a255a137011fc41496b040efb3252eb (patch)
treec9edb7419ff29ca957920774f6610230cc403deb /security/openvpn/files/patch-629baad8
parentUpdate devel/elixir-swarm to version 0.4.4. (diff)
Update to new upstream bugfix release 2.3.12, add "stats" to rc script.
* Upstream changes: <https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.12> * The cmocka-based unit tests are currently disabled, too much hassle and deps to get them running. * Add patch-configure to drop the unit-test related warnings. * Extend run control script to understand the "stats" argument, to send SIGUSR2 to the process, contributed by Anton Yuzhaninov (with one additional line fold). * Drop patch-629baad8, no longer needed. * Refresh other patches with make clean extract do-patch makepatch
Notes
Notes: svn path=/head/; revision=420825
Diffstat (limited to 'security/openvpn/files/patch-629baad8')
-rw-r--r--security/openvpn/files/patch-629baad837
1 files changed, 0 insertions, 37 deletions
diff --git a/security/openvpn/files/patch-629baad8 b/security/openvpn/files/patch-629baad8
deleted file mode 100644
index 13b574b44cfe..000000000000
--- a/security/openvpn/files/patch-629baad8
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 629baad8f89af261445a2ace03694601f8e476f9
-Author: Steffan Karger <steffan@karger.me>
-Date: Fri May 13 08:54:52 2016 +0200
-
- 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>
-
-diff --git a/src/openvpn/ssl_polarssl.c b/src/openvpn/ssl_polarssl.c
-index 1f58369..9263698 100644
---- ./src/openvpn/ssl_polarssl.c
-+++ ./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);