tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

rekey refactor broke SSH1; spotted by Tom G. Christensen

Upstream-ID: 43f0d57928cc077c949af0bfa71ef574dcb58243
This commit is contained in:
djm@openbsd.org 2016-02-17 22:20:14 +00:00 committed by Damien Miller
parent 3a13cb543d
commit 292a8dee14
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packet.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -263,8 +263,8 @@ ssh_alloc_session_state(void)
int int
ssh_packet_is_rekeying(struct ssh *ssh) ssh_packet_is_rekeying(struct ssh *ssh)
{ {
return ssh->state->rekeying || return compat20 &&
(ssh->kex != NULL && ssh->kex->done == 0); (ssh->state->rekeying || (ssh->kex != NULL && ssh->kex->done == 0));
} }
/* /*