| 1 |
commit: 1687c28dae603160485d5aeaf5e9dbf1b5805cb6 |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 7 02:43:18 2016 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 7 02:43:18 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1687c28d |
| 7 |
|
| 8 |
net-misc/openssh: Update hpn patch in another attempt to fix the deadlock being seen on OSX |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
.../openssh/files/openssh-7.3_p1-hpn-update.patch | 43 +++++++++++++++------- |
| 13 |
1 file changed, 30 insertions(+), 13 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index cb11524..980a666 100644 |
| 17 |
--- a/net-misc/openssh/files/openssh-7.3_p1-hpn-update.patch |
| 18 |
+++ b/net-misc/openssh/files/openssh-7.3_p1-hpn-update.patch |
| 19 |
@@ -1,5 +1,5 @@ |
| 20 |
--- openssh-7_2_P2-hpn-14.10.diff.orig 2016-09-01 10:34:05.905112131 -0700 |
| 21 |
-+++ openssh-7_2_P2-hpn-14.10.diff 2016-09-06 17:34:54.903466727 -0700 |
| 22 |
++++ openssh-7_2_P2-hpn-14.10.diff 2016-09-06 19:35:24.308215237 -0700 |
| 23 |
@@ -156,145 +156,6 @@ |
| 24 |
compat.o crc32.o deattack.o fatal.o hostfile.o \ |
| 25 |
log.o match.o md-sha256.o moduli.o nchan.o packet.o opacket.o \ |
| 26 |
@@ -151,11 +151,28 @@ |
| 27 |
--- /dev/null |
| 28 |
+++ b/cipher-ctr-mt.c |
| 29 |
-@@ -0,0 +1,533 @@ |
| 30 |
-+@@ -0,0 +1,534 @@ |
| 31 |
++@@ -0,0 +1,535 @@ |
| 32 |
+/* |
| 33 |
+ * OpenSSH Multi-threaded AES-CTR Cipher |
| 34 |
+ * |
| 35 |
-@@ -893,6 +754,7 @@ |
| 36 |
+@@ -790,6 +651,7 @@ |
| 37 |
+ + * can see that it's being filled. |
| 38 |
+ + */ |
| 39 |
+ + q->qstate = KQFILLING; |
| 40 |
+++ pthread_cond_broadcast(&q->cond); |
| 41 |
+ + pthread_mutex_unlock(&q->lock); |
| 42 |
+ + for (i = 0; i < KQLEN; i++) { |
| 43 |
+ + AES_encrypt(q->ctr, q->keys[i], &key); |
| 44 |
+@@ -801,7 +663,7 @@ |
| 45 |
+ + ssh_ctr_add(q->ctr, KQLEN * (NUMKQ - 1), AES_BLOCK_SIZE); |
| 46 |
+ + q->qstate = KQFULL; |
| 47 |
+ + STATS_FILL(stats); |
| 48 |
+-+ pthread_cond_signal(&q->cond); |
| 49 |
+++ pthread_cond_broadcast(&q->cond); |
| 50 |
+ + pthread_mutex_unlock(&q->lock); |
| 51 |
+ + } |
| 52 |
+ + |
| 53 |
+@@ -893,6 +755,7 @@ |
| 54 |
+ pthread_cond_wait(&q->cond, &q->lock); |
| 55 |
+ } |
| 56 |
+ q->qstate = KQDRAINING; |
| 57 |
@@ -163,7 +180,7 @@ |
| 58 |
+ pthread_mutex_unlock(&q->lock); |
| 59 |
+ |
| 60 |
+ /* Mark consumed queue empty and signal producers */ |
| 61 |
-@@ -1270,7 +1132,7 @@ |
| 62 |
+@@ -1270,7 +1133,7 @@ |
| 63 |
|
| 64 |
#include "ssherr.h" |
| 65 |
#include "sshbuf.h" |
| 66 |
@@ -172,7 +189,7 @@ |
| 67 |
#include "digest.h" |
| 68 |
|
| 69 |
#if OPENSSL_VERSION_NUMBER >= 0x00907000L |
| 70 |
-@@ -1312,8 +1174,8 @@ |
| 71 |
+@@ -1312,8 +1175,8 @@ |
| 72 |
+ */ |
| 73 |
+ if (ctos && !log_flag) { |
| 74 |
+ logit("SSH: Server;Ltype: Kex;Remote: %s-%d;Enc: %s;MAC: %s;Comp: %s", |
| 75 |
@@ -183,7 +200,7 @@ |
| 76 |
+ newkeys->enc.name, |
| 77 |
+ authlen == 0 ? newkeys->mac.name : "<implicit>", |
| 78 |
+ newkeys->comp.name); |
| 79 |
-@@ -1430,7 +1292,7 @@ |
| 80 |
+@@ -1430,7 +1293,7 @@ |
| 81 |
+ rekey_requested = 0; |
| 82 |
+ return 1; |
| 83 |
+ } |
| 84 |
@@ -192,7 +209,7 @@ |
| 85 |
/* Time-based rekeying */ |
| 86 |
if (state->rekey_interval != 0 && |
| 87 |
state->rekey_time + state->rekey_interval <= monotime()) |
| 88 |
-@@ -1490,7 +1352,7 @@ |
| 89 |
+@@ -1490,7 +1353,7 @@ |
| 90 |
|
| 91 |
transferred = *counter - (cur_pos ? cur_pos : start_pos); |
| 92 |
cur_pos = *counter; |
| 93 |
@@ -201,7 +218,7 @@ |
| 94 |
bytes_left = end_pos - cur_pos; |
| 95 |
|
| 96 |
+ delta_pos = cur_pos - last_pos; |
| 97 |
-@@ -1564,8 +1426,8 @@ |
| 98 |
+@@ -1564,8 +1427,8 @@ |
| 99 |
{ "canonicaldomains", oCanonicalDomains }, |
| 100 |
{ "canonicalizefallbacklocal", oCanonicalizeFallbackLocal }, |
| 101 |
@@ -282,6 +287,11 @@ static struct { |
| 102 |
@@ -211,7 +228,7 @@ |
| 103 |
|
| 104 |
+ { "tcprcvbufpoll", oTcpRcvBufPoll }, |
| 105 |
+ { "tcprcvbuf", oTcpRcvBuf }, |
| 106 |
-@@ -1736,8 +1598,8 @@ |
| 107 |
+@@ -1736,8 +1599,8 @@ |
| 108 |
off_t size, statbytes; |
| 109 |
unsigned long long ull; |
| 110 |
int setimes, targisdir, wrerrno = 0; |
| 111 |
@@ -222,7 +239,7 @@ |
| 112 |
struct timeval tv[2]; |
| 113 |
|
| 114 |
#define atime tv[0] |
| 115 |
-@@ -1956,32 +1818,6 @@ |
| 116 |
+@@ -1956,32 +1819,6 @@ |
| 117 |
} |
| 118 |
|
| 119 |
/* |
| 120 |
@@ -255,7 +272,7 @@ |
| 121 |
@@ -1041,8 +1064,12 @@ server_request_tun(void) |
| 122 |
sock = tun_open(tun, mode); |
| 123 |
if (sock < 0) |
| 124 |
-@@ -2372,10 +2208,10 @@ |
| 125 |
+@@ -2372,10 +2209,10 @@ |
| 126 |
debug("Client protocol version %d.%d; client software version %.100s", |
| 127 |
remote_major, remote_minor, remote_version); |
| 128 |
+ logit("SSH: Server;Ltype: Version;Remote: %s-%d;Protocol: %d.%d;Client: %.100s", |
| 129 |
@@ -268,7 +285,7 @@ |
| 130 |
|
| 131 |
@@ -1160,6 +1163,8 @@ server_listen(void) |
| 132 |
int ret, listen_sock, on = 1; |
| 133 |
-@@ -2413,7 +2249,7 @@ |
| 134 |
+@@ -2413,7 +2250,7 @@ |
| 135 |
if (options.challenge_response_authentication) |
| 136 |
options.kbd_interactive_authentication = 1; |
| 137 |
@@ -2151,6 +2168,9 @@ main(int ac, char **av) |
| 138 |
@@ -277,7 +294,7 @@ |
| 139 |
free(laddr); |
| 140 |
|
| 141 |
+ /* set the HPN options for the child */ |
| 142 |
-@@ -2486,11 +2322,10 @@ |
| 143 |
+@@ -2486,11 +2323,10 @@ |
| 144 |
index eb4e948..3692722 100644 |
| 145 |
--- a/version.h |
| 146 |
+++ b/version.h |
Archives