summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <patrick.mclean@sony.com>2018-10-26 11:34:55 -0700
committerPatrick McLean <chutzpah@gentoo.org>2018-10-26 11:35:07 -0700
commit1b0868a46a94ecf8697e19f5761067c72ba9b355 (patch)
treedd5ae504bde6639e5f659990e81920d3ea61c75d /net-misc/openssh
parentnet-misc/openssl: Fix building on libressl with USE=hpn (diff)
downloadgentoo-1b0868a46a94ecf8697e19f5761067c72ba9b355.tar.gz
gentoo-1b0868a46a94ecf8697e19f5761067c72ba9b355.tar.bz2
gentoo-1b0868a46a94ecf8697e19f5761067c72ba9b355.zip
net-misc/openssh: Previous fix in 7.9_p1 broke patch
Fixes: d9479289f3cd4833538cc7c89fdc65a05685b439 Signed-off-by: Patrick McLean <chutzpah@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch16
1 files changed, 0 insertions, 16 deletions
diff --git a/net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch b/net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch
index c07ad0414ef..78b75453274 100644
--- a/net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch
+++ b/net-misc/openssh/files/openssh-7.9_p1-hpn-openssl-1.1.patch
@@ -27,22 +27,6 @@
#ifdef __linux__
cipher_threads = sysconf(_SC_NPROCESSORS_ONLN) / 2;
#endif /*__linux__*/
-@@ -505,11 +503,12 @@
- if (cipher_threads < 2)
- cipher_threads = 2;
-
-- /* assure that we aren't trying to create more threads than we have in the struct */
-- /* cipher_threads is half the total of allowable threads hence the odd looking math here */
-+ /* assure that we aren't trying to create more threads */
-+ /* than we have in the struct. cipher_threads is half the */
-+ /* total of allowable threads hence the odd looking math here */
- if (cipher_threads * 2 > MAX_THREADS)
- cipher_threads = MAX_THREADS / 2;
--
-+
- /* set the number of keystream queues */
- numkq = cipher_threads * 2;
-
@@ -551,16 +550,16 @@
}