diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-03 13:42:34 +0000 |
commit | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch) | |
tree | 3cb05783d73b2c33589ba305144a31c718e123cd /net-ftp/pure-ftpd/files | |
parent | 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff) |
gentoo resync : 03.03.2019
Diffstat (limited to 'net-ftp/pure-ftpd/files')
-rw-r--r-- | net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch | 22 | ||||
-rw-r--r-- | net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch | 21 |
2 files changed, 43 insertions, 0 deletions
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch new file mode 100644 index 000000000000..cd4532bb97ab --- /dev/null +++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.1.patch @@ -0,0 +1,22 @@ +From aa68b2d620ef0c83c7f52213c7e6093722b0b8bd Mon Sep 17 00:00:00 2001 +From: Frank Denis <github@pureftpd.org> +Date: Wed, 24 Oct 2018 19:19:26 +0200 +Subject: [PATCH] Disable TLSv1_1 + +--- + src/tls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tls.c b/src/tls.c +index f383ed9..c4e2a1b 100644 +--- a/src/tls.c ++++ b/src/tls.c +@@ -297,7 +297,7 @@ int tls_init_library(void) + SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1); + # endif + # ifdef SSL_OP_NO_TLSv1_1 +- SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_1); ++ SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1_1); + # endif + # ifdef SSL_OP_NO_TLSv1_2 + SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_2); diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch new file mode 100644 index 000000000000..cbe9c8bdcb8f --- /dev/null +++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.47-disable-TLSv1.3.patch @@ -0,0 +1,21 @@ +Temporarily disable TLSv1.3 support + +Disable TLSv1.3 until support for it is fixed in pure-ftpd. This is a +workaround for the following issue: +https://github.com/jedisct1/pure-ftpd/issues/102 + +--- a/src/tls.c ++++ b/src/tls.c +@@ -301,6 +301,10 @@ int tls_init_library(void) + # endif + # ifdef SSL_OP_NO_TLSv1_2 + SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_2); ++# endif ++ /* Disable TLSv1.3 support until it works properly in pure-ftpd */ ++# ifdef SSL_OP_NO_TLSv1_3 ++ SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1_3); + # endif + if (tlsciphersuite != NULL) { + if (SSL_CTX_set_cipher_list(tls_ctx, tlsciphersuite) != 1) { +-- +2.20.1 |