Call for testing: OpenSSH 7.2

[Damien Miller]

On Wed, 17 Feb 2016, Tom G. Christensen wrote:

> On 12/02/16 04:56, Damien Miller wrote:
> > Portable OpenSSH is available via Git at
> > https://anongit.mindrot.org/openssh.git/ or via a mirror on Github at
> > https://github.com/openssh/openssh-portable
> > 
> 
> I'm seeing a hang in the testsuite on Solaris:
> run test transfer.sh ...
> transfer data: proto 1
> <hangs here>
> 
> I've tested on 2.6, 7 and 9, x86 only for now.
> 
> I bisected it on Solaris 2.6 and the culprit is:
> 19bcf2ea2d17413f2d9730dd2a19575ff86b9b6a
>
> Reverting it gets rid of the hang and the testsuite runs to completion
> with no errors.

Thanks for the analysis. I think this fixes it.

diff --git a/packet.c b/packet.c
index 7ddebeb..6755e74 100644
--- a/packet.c
+++ b/packet.c
@@ -263,8 +263,8 @@ ssh_alloc_session_state(void)
 int
 ssh_packet_is_rekeying(struct ssh *ssh)
 {
-	return ssh->state->rekeying ||
-	    (ssh->kex != NULL && ssh->kex->done == 0);
+	return compat20 &&
+	    (ssh->state->rekeying || (ssh->kex != NULL && ssh->kex->done == 0));
 }
 
 /*