diff options
author | Manuel Rüger <mrueg@gentoo.org> | 2016-07-09 15:59:09 +0200 |
---|---|---|
committer | Manuel Rüger <mrueg@gentoo.org> | 2016-07-09 15:59:09 +0200 |
commit | fb1d10decb6790e409312fa64f549318a3185075 (patch) | |
tree | 2e737a99571e0c0c7d59d549aa6eecbfabb5935b /net-misc/openvpn/files | |
parent | app-shells/thefuck: Remove old (diff) | |
download | gentoo-fb1d10decb6790e409312fa64f549318a3185075.tar.gz gentoo-fb1d10decb6790e409312fa64f549318a3185075.tar.bz2 gentoo-fb1d10decb6790e409312fa64f549318a3185075.zip |
net-misc/openvpn: Remove old
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-misc/openvpn/files')
-rw-r--r-- | net-misc/openvpn/files/2.3.6-disable-compression.patch | 18 | ||||
-rw-r--r-- | net-misc/openvpn/files/2.3.6-null-cipher.patch | 46 | ||||
-rw-r--r-- | net-misc/openvpn/files/openvpn-2.3.10-fix-libressl.patch | 36 |
3 files changed, 0 insertions, 100 deletions
diff --git a/net-misc/openvpn/files/2.3.6-disable-compression.patch b/net-misc/openvpn/files/2.3.6-disable-compression.patch deleted file mode 100644 index d9d1c764e908..000000000000 --- a/net-misc/openvpn/files/2.3.6-disable-compression.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://community.openvpn.net/openvpn/changeset/5d5233778868ddd568140c394adfcfc8e3453245/ - ---- openvpn-2.3.6/src/openvpn/ssl_openssl.c.orig 2014-11-29 23:00:35.000000000 +0800 -+++ openvpn-2.3.6/src/openvpn/ssl_openssl.c 2015-01-12 21:14:30.186993686 +0800 -@@ -238,6 +238,13 @@ - if (tls_ver_min > TLS_VER_1_2 || tls_ver_max < TLS_VER_1_2) - sslopt |= SSL_OP_NO_TLSv1_2; - #endif -+ -+#ifdef SSL_OP_NO_COMPRESSION -+ msg (M_WARN, "[Workaround] disable SSL compression"); -+ sslopt |= SSL_OP_NO_COMPRESSION; -+#endif -+ -+ - SSL_CTX_set_options (ctx->ctx, sslopt); - } - diff --git a/net-misc/openvpn/files/2.3.6-null-cipher.patch b/net-misc/openvpn/files/2.3.6-null-cipher.patch deleted file mode 100644 index 1e831cfa213a..000000000000 --- a/net-misc/openvpn/files/2.3.6-null-cipher.patch +++ /dev/null @@ -1,46 +0,0 @@ -The "really fix cipher none" patch has been merged to release/2.3 and master: - -commit 785838614afc20d362b64907b0212e9a779e2287 (release/2.3) -commit 98156e90e1e83133a6a6a020db8e7333ada6156b (master) - -diff --git a/src/openvpn/crypto_backend.h b/src/openvpn/crypto_backend.h -index 8749878..4e45df0 100644 ---- a/src/openvpn/crypto_backend.h -+++ b/src/openvpn/crypto_backend.h -@@ -237,8 +237,7 @@ int cipher_kt_mode (const cipher_kt_t *cipher_kt); - * - * @return true iff the cipher is a CBC mode cipher. - */ --bool cipher_kt_mode_cbc(const cipher_kt_t *cipher) -- __attribute__((nonnull)); -+bool cipher_kt_mode_cbc(const cipher_kt_t *cipher); - - /** - * Check if the supplied cipher is a supported OFB or CFB mode cipher. -@@ -247,8 +246,7 @@ bool cipher_kt_mode_cbc(const cipher_kt_t *cipher) - * - * @return true iff the cipher is a OFB or CFB mode cipher. - */ --bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher) -- __attribute__((nonnull)); -+bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher); - - - /** -diff --git a/tests/t_lpback.sh b/tests/t_lpback.sh -index 8f88ad9..d7792cd 100755 ---- a/tests/t_lpback.sh -+++ b/tests/t_lpback.sh -@@ -35,6 +35,9 @@ CIPHERS=$(${top_builddir}/src/openvpn/openvpn --show-ciphers | \ - # GD, 2014-07-06 do not test RC5-* either (fails on NetBSD w/o libcrypto_rc5) - CIPHERS=$(echo "$CIPHERS" | egrep -v '^(DES-EDE3-CFB1|DES-CFB1|RC5-)' ) - -+# Also test cipher 'none' -+CIPHERS=${CIPHERS}$(printf "\nnone") -+ - "${top_builddir}/src/openvpn/openvpn" --genkey --secret key.$$ - set +e - --- -1.9.1 - diff --git a/net-misc/openvpn/files/openvpn-2.3.10-fix-libressl.patch b/net-misc/openvpn/files/openvpn-2.3.10-fix-libressl.patch deleted file mode 100644 index 35e5b367645d..000000000000 --- a/net-misc/openvpn/files/openvpn-2.3.10-fix-libressl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9dfc2309c6b4143892137844197f5f84755f6580 Mon Sep 17 00:00:00 2001 -From: Niels Ole Salscheider <niels_ole@salscheider-online.de> -Date: Sun, 10 Jan 2016 14:44:35 +0100 -Subject: [PATCH] Fix build with libressl - -Signed-off-by: Niels Ole Salscheider <niels_ole@salscheider-online.de> -Acked-by: Steffan Karger <steffan.karger@fox-it.com> -Message-Id: <1452433475-16779-1-git-send-email-niels_ole@salscheider-online.de> -URL: http://article.gmane.org/gmane.network.openvpn.devel/10975 -Signed-off-by: Gert Doering <gert@greenie.muc.de> ---- - src/openvpn/ssl_openssl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c -index d2f40e7..e390f4d 100644 ---- a/src/openvpn/ssl_openssl.c -+++ b/src/openvpn/ssl_openssl.c -@@ -358,7 +358,7 @@ tls_ctx_check_cert_time (const struct tls_root_ctx *ctx) - - ASSERT (ctx); - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - /* OpenSSL 1.0.2 and up */ - cert = SSL_CTX_get0_certificate (ctx->ctx); - #else -@@ -393,7 +393,7 @@ tls_ctx_check_cert_time (const struct tls_root_ctx *ctx) - } - - cleanup: --#if OPENSSL_VERSION_NUMBER < 0x10002000L -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_free (ssl); - #endif - return; |