summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-04-05 22:25:43 +0200
committerLars Wendler <polynomial-c@gentoo.org>2017-04-05 22:26:33 +0200
commit23fb07df54a4817b6f9ead5676754576b07ceff3 (patch)
tree2a4321a11b837bd5dea83bab7f9d428aac3a5f1d /net-ftp/pure-ftpd/files
parentmedia-libs/simage: add ~ppc64 keyword (bug 550040) (diff)
downloadgentoo-23fb07df54a4817b6f9ead5676754576b07ceff3.tar.gz
gentoo-23fb07df54a4817b6f9ead5676754576b07ceff3.tar.bz2
gentoo-23fb07df54a4817b6f9ead5676754576b07ceff3.zip
net-ftp/pure-ftpd: Added openssl-1.1 patch (bug #592500).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'net-ftp/pure-ftpd/files')
-rw-r--r--net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch
new file mode 100644
index 000000000000..714809f37af1
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.45-openssl-1.1.patch
@@ -0,0 +1,41 @@
+From 54cc692f997c72eb530f38e62de38ed444eb152e Mon Sep 17 00:00:00 2001
+From: Frank Denis <github@pureftpd.org>
+Date: Wed, 5 Apr 2017 12:30:32 -0700
+Subject: [PATCH] Add strict support for the OpenSSL 1.1 API
+
+---
+ src/tls.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/tls.c b/src/tls.c
+index 3c87bbb..21c83b2 100644
+--- a/src/tls.c
++++ b/src/tls.c
+@@ -258,9 +258,17 @@ int tls_init_library(void)
+
+ tls_cnx_handshook = 0;
+ tls_data_cnx_handshook = 0;
++# if OPENSSL_VERSION_NUMBER < 0x10100000L
+ SSL_library_init();
+ SSL_load_error_strings();
+ OpenSSL_add_all_algorithms();
++# else
++ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
++ OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
++ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
++ OPENSSL_INIT_ADD_ALL_DIGESTS |
++ OPENSSL_INIT_LOAD_CONFIG, NULL);
++# endif
+ while (RAND_status() == 0) {
+ rnd = zrand();
+ RAND_seed(&rnd, (int) sizeof rnd);
+@@ -347,7 +355,9 @@ void tls_free_library(void)
+ SSL_CTX_free(tls_ctx);
+ tls_ctx = NULL;
+ }
++# if OPENSSL_API_COMPAT < 0x10100000L
+ EVP_cleanup();
++# endif
+ }
+
+ int tls_init_new_session(void)