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 C3C3D138330 for ; Sat, 10 Sep 2016 00:00:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EA26E0979; Sat, 10 Sep 2016 00:00:09 +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 C6303E09B2 for ; Sat, 10 Sep 2016 00:00:06 +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 DB293340688 for ; Fri, 9 Sep 2016 17:20:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F97E2474 for ; Fri, 9 Sep 2016 17:20:03 +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: <1473441578.c2216a5c7ae4fa8bf28c41ef2440fd968320d8ab.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-cipher-ctr-mt-no-deadlocks.patch X-VCS-Directories: net-misc/openssh/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: c2216a5c7ae4fa8bf28c41ef2440fd968320d8ab X-VCS-Branch: master Date: Fri, 9 Sep 2016 17:20:03 +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: c36d1b6c-88cc-45a7-b76d-63f67d0ff8ed X-Archives-Hash: 925789982a3c5a9c0b76716f62dffdb2 commit: c2216a5c7ae4fa8bf28c41ef2440fd968320d8ab Author: Patrick McLean gentoo org> AuthorDate: Fri Sep 9 17:19:38 2016 +0000 Commit: Patrick McLean gentoo org> CommitDate: Fri Sep 9 17:19:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2216a5c net-misc/openssh: Minor bugfix in 7.3_p1-r1 for OSX Package-Manager: portage-2.3.0 .../openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch b/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch index 19bd08b..9cc7b61 100644 --- a/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch +++ b/net-misc/openssh/files/openssh-7.3_p1-hpn-cipher-ctr-mt-no-deadlocks.patch @@ -1,5 +1,5 @@ diff --git a/cipher-ctr-mt.c b/cipher-ctr-mt.c -index fdc9b2f..3ffe6d1 100644 +index fdc9b2f..300cd90 100644 --- a/cipher-ctr-mt.c +++ b/cipher-ctr-mt.c @@ -127,7 +127,7 @@ struct kq { @@ -160,7 +160,7 @@ index fdc9b2f..3ffe6d1 100644 c->state = HAVE_NONE; for (i = 0; i < NUMKQ; i++) { -@@ -409,11 +481,9 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, +@@ -409,11 +481,14 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, } if (c->state == (HAVE_KEY | HAVE_IV)) { @@ -172,10 +172,15 @@ index fdc9b2f..3ffe6d1 100644 + /* tell the pregen threads to exit */ + stop_and_join_pregen_threads(c); + ++#ifdef __APPLE__ ++ /* reset the exit flag */ ++ c->exit_flag = FALSE; ++#endif /* __APPLE__ */ ++ /* Start over getting key & iv */ c->state = HAVE_NONE; } -@@ -444,10 +514,12 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, +@@ -444,10 +519,12 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, /* Start threads */ for (i = 0; i < CIPHER_THREADS; i++) { debug("spawned a thread"); @@ -189,7 +194,7 @@ index fdc9b2f..3ffe6d1 100644 pthread_cond_wait(&c->q[0].cond, &c->q[0].lock); pthread_mutex_unlock(&c->q[0].lock); } -@@ -461,15 +533,10 @@ void +@@ -461,15 +538,10 @@ void ssh_aes_ctr_thread_destroy(EVP_CIPHER_CTX *ctx) { struct ssh_aes_ctr_ctx *c; @@ -208,7 +213,7 @@ index fdc9b2f..3ffe6d1 100644 } void -@@ -481,7 +548,9 @@ ssh_aes_ctr_thread_reconstruction(EVP_CIPHER_CTX *ctx) +@@ -481,7 +553,9 @@ ssh_aes_ctr_thread_reconstruction(EVP_CIPHER_CTX *ctx) /* reconstruct threads */ for (i = 0; i < CIPHER_THREADS; i++) { debug("spawned a thread"); @@ -218,7 +223,7 @@ index fdc9b2f..3ffe6d1 100644 } } -@@ -489,18 +558,13 @@ static int +@@ -489,18 +563,13 @@ static int ssh_aes_ctr_cleanup(EVP_CIPHER_CTX *ctx) { struct ssh_aes_ctr_ctx *c;