From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BADD6138330 for ; Wed, 7 Sep 2016 04:54:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CC0421C223; Wed, 7 Sep 2016 04:54:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF34B21C227 for ; Wed, 7 Sep 2016 04:54:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3117334058A for ; Wed, 7 Sep 2016 04:54:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 745712469 for ; Wed, 7 Sep 2016 04:54:29 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1473224063.fdc9882838209d6a427031ad87a79fa18a443851.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-7.3_p1-hpn-update.patch X-VCS-Directories: net-misc/openssh/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: fdc9882838209d6a427031ad87a79fa18a443851 X-VCS-Branch: master Date: Wed, 7 Sep 2016 04:54:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 45625f5e-ba29-42dd-af72-25ea62c71056 X-Archives-Hash: 05c79e6ad9c9bcf656c08ff6dab2c014 commit: fdc9882838209d6a427031ad87a79fa18a443851 Author: Patrick McLean gentoo org> AuthorDate: Wed Sep 7 04:54:04 2016 +0000 Commit: Patrick McLean gentoo org> CommitDate: Wed Sep 7 04:54:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdc98828 net-misc/openssh: Add a workaround to HPN for the OSX threading implemntation The MT AES-CTR has a section of code that compares the currently running thread's thread id with the first thread created. It seems on OSX, the first thread will sometimes run before the thread ID is filled in (hence is zero), so this test will fail, and the initialization code does not get run. This makes the test also check if the thread ID of the first thread is 0, and run the initialization code in that case as well. Package-Manager: portage-2.3.0 net-misc/openssh/files/openssh-7.3_p1-hpn-update.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 980a666..8ae29e1 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-06 19:35:24.308215237 -0700 ++++ openssh-7_2_P2-hpn-14.10.diff 2016-09-06 21:49:35.583704017 -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 \ @@ -155,6 +155,15 @@ +/* + * OpenSSH Multi-threaded AES-CTR Cipher + * +@@ -737,7 +598,7 @@ + + * Handle the special case of startup, one thread must fill + + * the first KQ then mark it as draining. Lock held throughout. + + */ +-+ if (pthread_equal(pthread_self(), c->tid[0])) { +++ if (pthread_equal(pthread_self(), c->tid[0]) || c->tid[0] == 0) { + + q = &c->q[0]; + + pthread_mutex_lock(&q->lock); + + if (q->qstate == KQINIT) { @@ -790,6 +651,7 @@ + * can see that it's being filled. + */