commit 292a8dee14e5e67dcd1b49ba5c7b9023e8420d59
author djm@openbsd.org <djm@openbsd.org> Wed Feb 17 22:20:14 2016 +0000
committer Damien Miller <djm@mindrot.org> Thu Feb 18 09:24:41 2016 +1100
tree 5c7d070c1fccfb47b147dc52e98fb4496a3647a5
parent 3a13cb543df9919aec2fc6b75f3dd3802facaeca

upstream commit

rekey refactor broke SSH1; spotted by Tom G. Christensen

Upstream-ID: 43f0d57928cc077c949af0bfa71ef574dcb58243

packet.c

diff --git a/packet.c b/packet.c
index 7ddebeb..f406c07 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.228 2016/02/08 10:57:07 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.229 2016/02/17 22:20:14 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -263,8 +263,8 @@
 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));
 }
 
 /*