diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-02-17 22:20:14 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-02-18 09:24:41 +1100 |
| commit | 292a8dee14e5e67dcd1b49ba5c7b9023e8420d59 (patch) | |
| tree | 5c7d070c1fccfb47b147dc52e98fb4496a3647a5 /packet.c | |
| parent | 3a13cb543df9919aec2fc6b75f3dd3802facaeca (diff) | |
upstream commit
rekey refactor broke SSH1; spotted by Tom G. Christensen
Upstream-ID: 43f0d57928cc077c949af0bfa71ef574dcb58243
Diffstat (limited to 'packet.c')
| -rw-r--r-- | packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 @@ 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)); } /* |