summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2016-09-06 18:07:15 -0700
committerPatrick McLean <chutzpah@gentoo.org>2016-09-06 18:12:03 -0700
commitc93af501f1fb49d758bb8a606231238716f4f3b4 (patch)
tree3228ea8cdea54a6f3b050788b013fc945229da37 /net-misc
parentgnome-base/gnome-shell: version bump from 3.20.3 to 3.20.4 (diff)
downloadgentoo-c93af501f1fb49d758bb8a606231238716f4f3b4.tar.gz
gentoo-c93af501f1fb49d758bb8a606231238716f4f3b4.tar.bz2
gentoo-c93af501f1fb49d758bb8a606231238716f4f3b4.zip
net-misc/openssh: Update hpn update patch to add fix for deadlock
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/files/openssh-7.3_p1-hpn-update.patch39
1 files changed, 28 insertions, 11 deletions
diff --git a/net-misc/openssh/files/openssh-7.3_p1-hpn-update.patch b/net-misc/openssh/files/openssh-7.3_p1-hpn-update.patch
index 2c4cc50db9cd..cb115244c859 100644
--- a/net-misc/openssh/files/openssh-7.3_p1-hpn-update.patch
+++ b/net-misc/openssh/files/openssh-7.3_p1-hpn-update.patch
@@ -1,5 +1,5 @@
--- openssh-7_2_P2-hpn-14.10.diff.orig 2016-09-01 10:34:05.905112131 -0700
-+++ openssh-7_2_P2-hpn-14.10.diff 2016-09-01 11:33:19.106664802 -0700
++++ openssh-7_2_P2-hpn-14.10.diff 2016-09-06 17:34:54.903466727 -0700
@@ -156,145 +156,6 @@
compat.o crc32.o deattack.o fatal.o hostfile.o \
log.o match.o md-sha256.o moduli.o nchan.o packet.o opacket.o \
@@ -146,7 +146,24 @@
diff --git a/channels.c b/channels.c
index c9d2015..13b30a1 100644
--- a/channels.c
-@@ -1270,7 +1131,7 @@
+@@ -519,7 +380,7 @@
+ index 0000000..fdc9b2f
+ --- /dev/null
+ +++ b/cipher-ctr-mt.c
+-@@ -0,0 +1,533 @@
++@@ -0,0 +1,534 @@
+ +/*
+ + * OpenSSH Multi-threaded AES-CTR Cipher
+ + *
+@@ -893,6 +754,7 @@
+ + pthread_cond_wait(&q->cond, &q->lock);
+ + }
+ + q->qstate = KQDRAINING;
+++ pthread_cond_broadcast(&q->cond);
+ + pthread_mutex_unlock(&q->lock);
+ +
+ + /* Mark consumed queue empty and signal producers */
+@@ -1270,7 +1132,7 @@
#include "ssherr.h"
#include "sshbuf.h"
@@ -155,7 +172,7 @@
#include "digest.h"
#if OPENSSL_VERSION_NUMBER >= 0x00907000L
-@@ -1312,8 +1173,8 @@
+@@ -1312,8 +1174,8 @@
+ */
+ if (ctos && !log_flag) {
+ logit("SSH: Server;Ltype: Kex;Remote: %s-%d;Enc: %s;MAC: %s;Comp: %s",
@@ -166,7 +183,7 @@
+ newkeys->enc.name,
+ authlen == 0 ? newkeys->mac.name : "<implicit>",
+ newkeys->comp.name);
-@@ -1430,7 +1291,7 @@
+@@ -1430,7 +1292,7 @@
+ rekey_requested = 0;
+ return 1;
+ }
@@ -175,7 +192,7 @@
/* Time-based rekeying */
if (state->rekey_interval != 0 &&
state->rekey_time + state->rekey_interval <= monotime())
-@@ -1490,7 +1351,7 @@
+@@ -1490,7 +1352,7 @@
transferred = *counter - (cur_pos ? cur_pos : start_pos);
cur_pos = *counter;
@@ -184,7 +201,7 @@
bytes_left = end_pos - cur_pos;
+ delta_pos = cur_pos - last_pos;
-@@ -1564,8 +1425,8 @@
+@@ -1564,8 +1426,8 @@
{ "canonicaldomains", oCanonicalDomains },
{ "canonicalizefallbacklocal", oCanonicalizeFallbackLocal },
@@ -282,6 +287,11 @@ static struct {
@@ -194,7 +211,7 @@
+ { "tcprcvbufpoll", oTcpRcvBufPoll },
+ { "tcprcvbuf", oTcpRcvBuf },
-@@ -1736,8 +1597,8 @@
+@@ -1736,8 +1598,8 @@
off_t size, statbytes;
unsigned long long ull;
int setimes, targisdir, wrerrno = 0;
@@ -205,7 +222,7 @@
struct timeval tv[2];
#define atime tv[0]
-@@ -1956,32 +1817,6 @@
+@@ -1956,32 +1818,6 @@
}
/*
@@ -238,7 +255,7 @@
@@ -1041,8 +1064,12 @@ server_request_tun(void)
sock = tun_open(tun, mode);
if (sock < 0)
-@@ -2372,10 +2207,10 @@
+@@ -2372,10 +2208,10 @@
debug("Client protocol version %d.%d; client software version %.100s",
remote_major, remote_minor, remote_version);
+ logit("SSH: Server;Ltype: Version;Remote: %s-%d;Protocol: %d.%d;Client: %.100s",
@@ -251,7 +268,7 @@
@@ -1160,6 +1163,8 @@ server_listen(void)
int ret, listen_sock, on = 1;
-@@ -2413,7 +2248,7 @@
+@@ -2413,7 +2249,7 @@
if (options.challenge_response_authentication)
options.kbd_interactive_authentication = 1;
@@ -2151,6 +2168,9 @@ main(int ac, char **av)
@@ -260,7 +277,7 @@
free(laddr);
+ /* set the HPN options for the child */
-@@ -2486,11 +2321,10 @@
+@@ -2486,11 +2322,10 @@
index eb4e948..3692722 100644
--- a/version.h
+++ b/version.h